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/megaraid.h | |
| 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/megaraid.h')
| -rw-r--r-- | drivers/scsi/megaraid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 4b75fe619d9c..66529f11d23c 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
| @@ -991,8 +991,8 @@ static scb_t * mega_build_cmd(adapter_t *, Scsi_Cmnd *, int *); | |||
| 991 | static void __mega_runpendq(adapter_t *); | 991 | static void __mega_runpendq(adapter_t *); |
| 992 | static int issue_scb_block(adapter_t *, u_char *); | 992 | static int issue_scb_block(adapter_t *, u_char *); |
| 993 | 993 | ||
| 994 | static irqreturn_t megaraid_isr_memmapped(int, void *, struct pt_regs *); | 994 | static irqreturn_t megaraid_isr_memmapped(int, void *); |
| 995 | static irqreturn_t megaraid_isr_iomapped(int, void *, struct pt_regs *); | 995 | static irqreturn_t megaraid_isr_iomapped(int, void *); |
| 996 | 996 | ||
| 997 | static void mega_free_scb(adapter_t *, scb_t *); | 997 | static void mega_free_scb(adapter_t *, scb_t *); |
| 998 | 998 | ||