diff options
Diffstat (limited to 'drivers/net/hamachi.c')
-rw-r--r-- | drivers/net/hamachi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 5c89ae78a519..c3c0d67fc383 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
@@ -556,7 +556,7 @@ static void hamachi_timer(unsigned long data); | |||
556 | static void hamachi_tx_timeout(struct net_device *dev); | 556 | static void hamachi_tx_timeout(struct net_device *dev); |
557 | static void hamachi_init_ring(struct net_device *dev); | 557 | static void hamachi_init_ring(struct net_device *dev); |
558 | static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev); | 558 | static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev); |
559 | static irqreturn_t hamachi_interrupt(int irq, void *dev_instance, struct pt_regs *regs); | 559 | static irqreturn_t hamachi_interrupt(int irq, void *dev_instance); |
560 | static int hamachi_rx(struct net_device *dev); | 560 | static int hamachi_rx(struct net_device *dev); |
561 | static inline int hamachi_tx(struct net_device *dev); | 561 | static inline int hamachi_tx(struct net_device *dev); |
562 | static void hamachi_error(struct net_device *dev, int intr_status); | 562 | static void hamachi_error(struct net_device *dev, int intr_status); |
@@ -1376,7 +1376,7 @@ static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1376 | 1376 | ||
1377 | /* The interrupt handler does all of the Rx thread work and cleans up | 1377 | /* The interrupt handler does all of the Rx thread work and cleans up |
1378 | after the Tx thread. */ | 1378 | after the Tx thread. */ |
1379 | static irqreturn_t hamachi_interrupt(int irq, void *dev_instance, struct pt_regs *rgs) | 1379 | static irqreturn_t hamachi_interrupt(int irq, void *dev_instance) |
1380 | { | 1380 | { |
1381 | struct net_device *dev = dev_instance; | 1381 | struct net_device *dev = dev_instance; |
1382 | struct hamachi_private *hmp = netdev_priv(dev); | 1382 | struct hamachi_private *hmp = netdev_priv(dev); |