diff options
Diffstat (limited to 'drivers/net/lasi_82596.c')
-rw-r--r-- | drivers/net/lasi_82596.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index da1eedef0b55..f4d815bca643 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
@@ -403,7 +403,7 @@ static char init_setup[] = | |||
403 | 403 | ||
404 | static int i596_open(struct net_device *dev); | 404 | static int i596_open(struct net_device *dev); |
405 | static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev); | 405 | static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev); |
406 | static irqreturn_t i596_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 406 | static irqreturn_t i596_interrupt(int irq, void *dev_id); |
407 | static int i596_close(struct net_device *dev); | 407 | static int i596_close(struct net_device *dev); |
408 | static struct net_device_stats *i596_get_stats(struct net_device *dev); | 408 | static struct net_device_stats *i596_get_stats(struct net_device *dev); |
409 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); | 409 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); |
@@ -527,7 +527,7 @@ static void i596_display_data(struct net_device *dev) | |||
527 | 527 | ||
528 | 528 | ||
529 | #if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET) | 529 | #if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET) |
530 | static void i596_error(int irq, void *dev_id, struct pt_regs *regs) | 530 | static void i596_error(int irq, void *dev_id) |
531 | { | 531 | { |
532 | struct net_device *dev = dev_id; | 532 | struct net_device *dev = dev_id; |
533 | volatile unsigned char *pcc2 = (unsigned char *) 0xfff42000; | 533 | volatile unsigned char *pcc2 = (unsigned char *) 0xfff42000; |
@@ -1252,12 +1252,12 @@ static int __devinit i82596_probe(struct net_device *dev, | |||
1252 | static void i596_poll_controller(struct net_device *dev) | 1252 | static void i596_poll_controller(struct net_device *dev) |
1253 | { | 1253 | { |
1254 | disable_irq(dev->irq); | 1254 | disable_irq(dev->irq); |
1255 | i596_interrupt(dev->irq, dev, NULL); | 1255 | i596_interrupt(dev->irq, dev); |
1256 | enable_irq(dev->irq); | 1256 | enable_irq(dev->irq); |
1257 | } | 1257 | } |
1258 | #endif | 1258 | #endif |
1259 | 1259 | ||
1260 | static irqreturn_t i596_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1260 | static irqreturn_t i596_interrupt(int irq, void *dev_id) |
1261 | { | 1261 | { |
1262 | struct net_device *dev = dev_id; | 1262 | struct net_device *dev = dev_id; |
1263 | struct i596_private *lp; | 1263 | struct i596_private *lp; |