diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
| commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
| tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /drivers/scsi/wd7000.c | |
| parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) | |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/scsi/wd7000.c')
| -rw-r--r-- | drivers/scsi/wd7000.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c index e7347c127..94c5e594c 100644 --- a/drivers/scsi/wd7000.c +++ b/drivers/scsi/wd7000.c @@ -143,6 +143,7 @@ #include <asm/system.h> #include <asm/dma.h> #include <asm/io.h> +#include <asm/irq.h> #include <linux/ioport.h> #include <linux/proc_fs.h> #include <linux/blk.h> @@ -215,7 +216,7 @@ typedef struct adapter { * Note that if SA_INTERRUPT is not used, wd7000_intr_handle must be * changed to pick up the IRQ level correctly. */ -Adapter *irq2host[16] = {NULL}; /* Possible IRQs are 0-15 */ +static Adapter *irq2host[NR_IRQS] = {NULL}; /* * (linear) base address for ROM BIOS @@ -1299,8 +1300,9 @@ int wd7000_detect (Scsi_Host_Template *tpnt) break; if ((i == pass) && - !memcmp ((void *) (wd7000_biosaddr[biosaddr_ptr] + - signatures[sig_ptr].ofs), signatures[sig_ptr].sig, + check_signature(wd7000_biosaddr[biosaddr_ptr] + + signatures[sig_ptr].ofs, + signatures[sig_ptr].sig, signatures[sig_ptr].len)) goto bios_matched; } @@ -1462,7 +1464,7 @@ int wd7000_abort(Scsi_Cmnd * SCpnt) /* * I also have no idea how to do a reset... */ -int wd7000_reset(Scsi_Cmnd * SCpnt) +int wd7000_reset(Scsi_Cmnd * SCpnt, unsigned int ignored) { return SCSI_RESET_PUNT; } |