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/isdn/hisax/telespci.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/isdn/hisax/telespci.c')
-rw-r--r-- | drivers/isdn/hisax/telespci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index dca446865f24..d09f6d033f15 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c | |||
@@ -226,7 +226,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) | |||
226 | #include "hscx_irq.c" | 226 | #include "hscx_irq.c" |
227 | 227 | ||
228 | static irqreturn_t | 228 | static irqreturn_t |
229 | telespci_interrupt(int intno, void *dev_id, struct pt_regs *regs) | 229 | telespci_interrupt(int intno, void *dev_id) |
230 | { | 230 | { |
231 | struct IsdnCardState *cs = dev_id; | 231 | struct IsdnCardState *cs = dev_id; |
232 | u_char hval, ival; | 232 | u_char hval, ival; |