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/atm/horizon.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/atm/horizon.c')
-rw-r--r-- | drivers/atm/horizon.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 209dba1c70da..33e9ee47392b 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c | |||
@@ -1382,12 +1382,10 @@ static inline void rx_data_av_handler (hrz_dev * dev) { | |||
1382 | 1382 | ||
1383 | /********** interrupt handler **********/ | 1383 | /********** interrupt handler **********/ |
1384 | 1384 | ||
1385 | static irqreturn_t interrupt_handler(int irq, void *dev_id, | 1385 | static irqreturn_t interrupt_handler(int irq, void *dev_id) { |
1386 | struct pt_regs *pt_regs) { | ||
1387 | hrz_dev * dev = (hrz_dev *) dev_id; | 1386 | hrz_dev * dev = (hrz_dev *) dev_id; |
1388 | u32 int_source; | 1387 | u32 int_source; |
1389 | unsigned int irq_ok; | 1388 | unsigned int irq_ok; |
1390 | (void) pt_regs; | ||
1391 | 1389 | ||
1392 | PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id); | 1390 | PRINTD (DBG_FLOW, "interrupt_handler: %p", dev_id); |
1393 | 1391 | ||