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/net/smc91x.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/net/smc91x.c')
-rw-r--r-- | drivers/net/smc91x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index d7e56438b5d6..506807fa5268 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -1284,7 +1284,7 @@ static void smc_eph_interrupt(struct net_device *dev) | |||
1284 | * This is the main routine of the driver, to handle the device when | 1284 | * This is the main routine of the driver, to handle the device when |
1285 | * it needs some attention. | 1285 | * it needs some attention. |
1286 | */ | 1286 | */ |
1287 | static irqreturn_t smc_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1287 | static irqreturn_t smc_interrupt(int irq, void *dev_id) |
1288 | { | 1288 | { |
1289 | struct net_device *dev = dev_id; | 1289 | struct net_device *dev = dev_id; |
1290 | struct smc_local *lp = netdev_priv(dev); | 1290 | struct smc_local *lp = netdev_priv(dev); |