diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/scsi/ibmmca.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
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/ibmmca.c')
| -rw-r--r-- | drivers/scsi/ibmmca.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 2be1dc5d852a..0e57fb6964d5 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c | |||
| @@ -497,8 +497,7 @@ static int option_setup(char *); | |||
| 497 | static int ldn_access_load(int, int); | 497 | static int ldn_access_load(int, int); |
| 498 | static int ldn_access_total_read_write(int); | 498 | static int ldn_access_total_read_write(int); |
| 499 | 499 | ||
| 500 | static irqreturn_t interrupt_handler(int irq, void *dev_id, | 500 | static irqreturn_t interrupt_handler(int irq, void *dev_id) |
| 501 | struct pt_regs *regs) | ||
| 502 | { | 501 | { |
| 503 | int host_index, ihost_index; | 502 | int host_index, ihost_index; |
| 504 | unsigned int intr_reg; | 503 | unsigned int intr_reg; |