diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /drivers/scsi/ibmmca.c | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
| download | linux-95d465fd750897ab32462a6702fbfe1b122cbbc0.tar.gz linux-95d465fd750897ab32462a6702fbfe1b122cbbc0.tar.bz2 linux-95d465fd750897ab32462a6702fbfe1b122cbbc0.zip | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'drivers/scsi/ibmmca.c')
| -rw-r--r-- | drivers/scsi/ibmmca.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index b60c1b9270f1..24eb59e143a9 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c @@ -2412,8 +2412,7 @@ static int ibmmca_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start, spin_lock_irqsave(hosts[i]->host_lock, flags); /* Check it */ host_index = i; if (!shpnt) { - len += sprintf(buffer + len, "\nIBM MCA SCSI: Can't find adapter for host number %d\n", - shpnt->host_no); + len += sprintf(buffer + len, "\nIBM MCA SCSI: Can't find adapter"); return len; } max_pun = subsystem_maxid(host_index); @@ -2489,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); |