diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/atm/horizon.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
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 | ||