diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:30:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:30:12 -0800 |
| commit | f61ea1b0c825a20a1826bb43a226387091934586 (patch) | |
| tree | fdedf0a2368f707e3fd5205db05bfcbac79606ec /drivers/scsi/aha152x.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SCSI] Missing const in sr_vendor (diff) | |
| download | linux-dev-f61ea1b0c825a20a1826bb43a226387091934586.tar.xz linux-dev-f61ea1b0c825a20a1826bb43a226387091934586.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/scsi/aha152x.c')
| -rw-r--r-- | drivers/scsi/aha152x.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index 9df23b654cec..cb2ee25f213f 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c @@ -259,6 +259,7 @@ #include "scsi.h" #include <scsi/scsi_dbg.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_transport_spi.h> #include "aha152x.h" @@ -1845,7 +1846,7 @@ static void msgi_run(struct Scsi_Host *shpnt) #if defined(AHA152X_DEBUG) if (HOSTDATA(shpnt)->debug & debug_msgi) { printk(INFO_LEAD "inbound message %02x ", CMDINFO(CURRENT_SC), MSGI(0)); - scsi_print_msg(&MSGI(0)); + spi_print_msg(&MSGI(0)); printk("\n"); } #endif @@ -1933,7 +1934,7 @@ static void msgi_run(struct Scsi_Host *shpnt) break; printk(INFO_LEAD, CMDINFO(CURRENT_SC)); - scsi_print_msg(&MSGI(0)); + spi_print_msg(&MSGI(0)); printk("\n"); ticks = (MSGI(3) * 4 + 49) / 50; @@ -2031,7 +2032,7 @@ static void msgo_init(struct Scsi_Host *shpnt) int i; printk(DEBUG_LEAD "messages( ", CMDINFO(CURRENT_SC)); - for (i=0; i<MSGOLEN; i+=scsi_print_msg(&MSGO(i)), printk(" ")) + for (i=0; i<MSGOLEN; i+=spi_print_msg(&MSGO(i)), printk(" ")) ; printk(")\n"); } |