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/net/tulip/interrupt.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/tulip/interrupt.c')
| -rw-r--r-- | drivers/net/tulip/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index 7f8f5d42a761..e3488d7b8ede 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
| @@ -496,7 +496,7 @@ static inline unsigned int phy_interrupt (struct net_device *dev) | |||
| 496 | 496 | ||
| 497 | /* The interrupt handler does all of the Rx thread work and cleans up | 497 | /* The interrupt handler does all of the Rx thread work and cleans up |
| 498 | after the Tx thread. */ | 498 | after the Tx thread. */ |
| 499 | irqreturn_t tulip_interrupt(int irq, void *dev_instance, struct pt_regs *regs) | 499 | irqreturn_t tulip_interrupt(int irq, void *dev_instance) |
| 500 | { | 500 | { |
| 501 | struct net_device *dev = (struct net_device *)dev_instance; | 501 | struct net_device *dev = (struct net_device *)dev_instance; |
| 502 | struct tulip_private *tp = netdev_priv(dev); | 502 | struct tulip_private *tp = netdev_priv(dev); |