diff options
Diffstat (limited to 'drivers/net/via-rhine.c')
-rw-r--r-- | drivers/net/via-rhine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index cbebf1b96e9d..ebbda1d8f542 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -404,7 +404,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val | |||
404 | static int rhine_open(struct net_device *dev); | 404 | static int rhine_open(struct net_device *dev); |
405 | static void rhine_tx_timeout(struct net_device *dev); | 405 | static void rhine_tx_timeout(struct net_device *dev); |
406 | static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev); | 406 | static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev); |
407 | static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *regs); | 407 | static irqreturn_t rhine_interrupt(int irq, void *dev_instance); |
408 | static void rhine_tx(struct net_device *dev); | 408 | static void rhine_tx(struct net_device *dev); |
409 | static int rhine_rx(struct net_device *dev, int limit); | 409 | static int rhine_rx(struct net_device *dev, int limit); |
410 | static void rhine_error(struct net_device *dev, int intr_status); | 410 | static void rhine_error(struct net_device *dev, int intr_status); |
@@ -569,7 +569,7 @@ static void __devinit rhine_reload_eeprom(long pioaddr, struct net_device *dev) | |||
569 | static void rhine_poll(struct net_device *dev) | 569 | static void rhine_poll(struct net_device *dev) |
570 | { | 570 | { |
571 | disable_irq(dev->irq); | 571 | disable_irq(dev->irq); |
572 | rhine_interrupt(dev->irq, (void *)dev, NULL); | 572 | rhine_interrupt(dev->irq, (void *)dev); |
573 | enable_irq(dev->irq); | 573 | enable_irq(dev->irq); |
574 | } | 574 | } |
575 | #endif | 575 | #endif |
@@ -1290,7 +1290,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1290 | 1290 | ||
1291 | /* The interrupt handler does all of the Rx thread work and cleans up | 1291 | /* The interrupt handler does all of the Rx thread work and cleans up |
1292 | after the Tx thread. */ | 1292 | after the Tx thread. */ |
1293 | static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *rgs) | 1293 | static irqreturn_t rhine_interrupt(int irq, void *dev_instance) |
1294 | { | 1294 | { |
1295 | struct net_device *dev = dev_instance; | 1295 | struct net_device *dev = dev_instance; |
1296 | struct rhine_private *rp = netdev_priv(dev); | 1296 | struct rhine_private *rp = netdev_priv(dev); |