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/ucc_geth.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 700ebd7d1457..12cd7b561f35 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -3844,8 +3844,7 @@ static int ucc_geth_poll(struct net_device *dev, int *budget) | |||
| 3844 | } | 3844 | } |
| 3845 | #endif /* CONFIG_UGETH_NAPI */ | 3845 | #endif /* CONFIG_UGETH_NAPI */ |
| 3846 | 3846 | ||
| 3847 | static irqreturn_t ucc_geth_irq_handler(int irq, void *info, | 3847 | static irqreturn_t ucc_geth_irq_handler(int irq, void *info) |
| 3848 | struct pt_regs *regs) | ||
| 3849 | { | 3848 | { |
| 3850 | struct net_device *dev = (struct net_device *)info; | 3849 | struct net_device *dev = (struct net_device *)info; |
| 3851 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3850 | ucc_geth_private_t *ugeth = netdev_priv(dev); |
| @@ -3910,7 +3909,7 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info, | |||
| 3910 | return IRQ_HANDLED; | 3909 | return IRQ_HANDLED; |
| 3911 | } | 3910 | } |
| 3912 | 3911 | ||
| 3913 | static irqreturn_t phy_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 3912 | static irqreturn_t phy_interrupt(int irq, void *dev_id) |
| 3914 | { | 3913 | { |
| 3915 | struct net_device *dev = (struct net_device *)dev_id; | 3914 | struct net_device *dev = (struct net_device *)dev_id; |
| 3916 | ucc_geth_private_t *ugeth = netdev_priv(dev); | 3915 | ucc_geth_private_t *ugeth = netdev_priv(dev); |