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/qla1280.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/qla1280.c')
-rw-r--r-- | drivers/scsi/qla1280.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 9f33e5946c0d..2521d548dd59 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
@@ -1113,7 +1113,7 @@ qla1280_enable_intrs(struct scsi_qla_host *ha) | |||
1113 | * Handles the H/W interrupt | 1113 | * Handles the H/W interrupt |
1114 | **************************************************************************/ | 1114 | **************************************************************************/ |
1115 | static irqreturn_t | 1115 | static irqreturn_t |
1116 | qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs) | 1116 | qla1280_intr_handler(int irq, void *dev_id) |
1117 | { | 1117 | { |
1118 | struct scsi_qla_host *ha; | 1118 | struct scsi_qla_host *ha; |
1119 | struct device_reg __iomem *reg; | 1119 | struct device_reg __iomem *reg; |