diff options
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r-- | drivers/net/mv643xx_eth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index eccedf3e627d..9997081c6dae 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -507,8 +507,7 @@ static void mv643xx_eth_update_pscr(struct net_device *dev, | |||
507 | * Output : N/A | 507 | * Output : N/A |
508 | */ | 508 | */ |
509 | 509 | ||
510 | static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id, | 510 | static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id) |
511 | struct pt_regs *regs) | ||
512 | { | 511 | { |
513 | struct net_device *dev = (struct net_device *)dev_id; | 512 | struct net_device *dev = (struct net_device *)dev_id; |
514 | struct mv643xx_private *mp = netdev_priv(dev); | 513 | struct mv643xx_private *mp = netdev_priv(dev); |
@@ -1252,7 +1251,7 @@ static void mv643xx_netpoll(struct net_device *netdev) | |||
1252 | /* wait for previous write to complete */ | 1251 | /* wait for previous write to complete */ |
1253 | mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); | 1252 | mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); |
1254 | 1253 | ||
1255 | mv643xx_eth_int_handler(netdev->irq, netdev, NULL); | 1254 | mv643xx_eth_int_handler(netdev->irq, netdev); |
1256 | 1255 | ||
1257 | mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL); | 1256 | mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL); |
1258 | } | 1257 | } |