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/sunlance.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/sunlance.c')
| -rw-r--r-- | drivers/net/sunlance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index feb42db10ee1..9207e19cac34 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
| @@ -820,7 +820,7 @@ out: | |||
| 820 | spin_unlock(&lp->lock); | 820 | spin_unlock(&lp->lock); |
| 821 | } | 821 | } |
| 822 | 822 | ||
| 823 | static irqreturn_t lance_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 823 | static irqreturn_t lance_interrupt(int irq, void *dev_id) |
| 824 | { | 824 | { |
| 825 | struct net_device *dev = (struct net_device *)dev_id; | 825 | struct net_device *dev = (struct net_device *)dev_id; |
| 826 | struct lance_private *lp = netdev_priv(dev); | 826 | struct lance_private *lp = netdev_priv(dev); |