Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / scsi / ibmmca.c

diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 3a8462e8d06354e390de6921df07190fbaa4ce61..24eb59e143a9503cb7d0a3ddf29a2bee7801924b 100644 (file)
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -2488,7 +2488,7 @@ static int option_setup(char *str)
        }
        ints[0] = i - 1;
        internal_ibmmca_scsi_setup(cur, ints);
-       return 0;
+       return 1;
 }
 
 __setup("ibmmcascsi=", option_setup);