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/gazel.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/gazel.c')
| -rw-r--r-- | drivers/isdn/hisax/gazel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index fe2937267777..3efa719b6d29 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c | |||
| @@ -243,7 +243,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) | |||
| 243 | #include "hscx_irq.c" | 243 | #include "hscx_irq.c" |
| 244 | 244 | ||
| 245 | static irqreturn_t | 245 | static irqreturn_t |
| 246 | gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs) | 246 | gazel_interrupt(int intno, void *dev_id) |
| 247 | { | 247 | { |
| 248 | #define MAXCOUNT 5 | 248 | #define MAXCOUNT 5 |
| 249 | struct IsdnCardState *cs = dev_id; | 249 | struct IsdnCardState *cs = dev_id; |
| @@ -274,7 +274,7 @@ gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs) | |||
| 274 | 274 | ||
| 275 | 275 | ||
| 276 | static irqreturn_t | 276 | static irqreturn_t |
| 277 | gazel_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) | 277 | gazel_interrupt_ipac(int intno, void *dev_id) |
| 278 | { | 278 | { |
| 279 | struct IsdnCardState *cs = dev_id; | 279 | struct IsdnCardState *cs = dev_id; |
| 280 | u_char ista, val; | 280 | u_char ista, val; |