diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/scsi/initio.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
| download | linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.gz linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.bz2 linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/initio.c')
| -rw-r--r-- | drivers/scsi/initio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index 9e10dac61cfd..911f2ff4a1f2 100644 --- a/drivers/scsi/initio.c +++ b/drivers/scsi/initio.c @@ -2748,7 +2748,7 @@ int tul_wait_done_disc(HCS * pCurHcb) return (tul_bad_seq(pCurHcb)); } -static irqreturn_t i91u_intr(int irqno, void *dev_id, struct pt_regs *regs) +static irqreturn_t i91u_intr(int irqno, void *dev_id) { struct Scsi_Host *dev = dev_id; unsigned long flags; |