diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 01:32:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 01:32:01 +0200 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/scsi/dc395x.c | |
parent | [PATCH] UDF: Fix mounting read-write (diff) | |
parent | IRQ: Maintain regs pointer globally rather than passing to IRQ handlers (diff) | |
download | linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.tar.xz linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.zip |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/scsi/dc395x.c')
-rw-r--r-- | drivers/scsi/dc395x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index c6118d99385e..81e3ee51d897 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c @@ -1813,8 +1813,7 @@ static void dc395x_handle_interrupt(struct AdapterCtlBlk *acb, } -static irqreturn_t dc395x_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t dc395x_interrupt(int irq, void *dev_id) { struct AdapterCtlBlk *acb = (struct AdapterCtlBlk *)dev_id; u16 scsi_status; |