diff options
Diffstat (limited to 'drivers/net/82596.c')
-rw-r--r-- | drivers/net/82596.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index c9e4dca9d410..8236f26ffd46 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -357,7 +357,7 @@ static char init_setup[] = | |||
357 | 357 | ||
358 | static int i596_open(struct net_device *dev); | 358 | static int i596_open(struct net_device *dev); |
359 | static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev); | 359 | static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev); |
360 | static irqreturn_t i596_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 360 | static irqreturn_t i596_interrupt(int irq, void *dev_id); |
361 | static int i596_close(struct net_device *dev); | 361 | static int i596_close(struct net_device *dev); |
362 | static struct net_device_stats *i596_get_stats(struct net_device *dev); | 362 | static struct net_device_stats *i596_get_stats(struct net_device *dev); |
363 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); | 363 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); |
@@ -501,7 +501,7 @@ static void i596_display_data(struct net_device *dev) | |||
501 | 501 | ||
502 | 502 | ||
503 | #if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET) | 503 | #if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET) |
504 | static irqreturn_t i596_error(int irq, void *dev_id, struct pt_regs *regs) | 504 | static irqreturn_t i596_error(int irq, void *dev_id) |
505 | { | 505 | { |
506 | struct net_device *dev = dev_id; | 506 | struct net_device *dev = dev_id; |
507 | #ifdef ENABLE_MVME16x_NET | 507 | #ifdef ENABLE_MVME16x_NET |
@@ -1283,7 +1283,7 @@ out: | |||
1283 | return ERR_PTR(err); | 1283 | return ERR_PTR(err); |
1284 | } | 1284 | } |
1285 | 1285 | ||
1286 | static irqreturn_t i596_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1286 | static irqreturn_t i596_interrupt(int irq, void *dev_id) |
1287 | { | 1287 | { |
1288 | struct net_device *dev = dev_id; | 1288 | struct net_device *dev = dev_id; |
1289 | struct i596_private *lp; | 1289 | struct i596_private *lp; |
@@ -1294,7 +1294,7 @@ static irqreturn_t i596_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1294 | #ifdef ENABLE_BVME6000_NET | 1294 | #ifdef ENABLE_BVME6000_NET |
1295 | if (MACH_IS_BVME6000) { | 1295 | if (MACH_IS_BVME6000) { |
1296 | if (*(char *) BVME_LOCAL_IRQ_STAT & BVME_ETHERR) { | 1296 | if (*(char *) BVME_LOCAL_IRQ_STAT & BVME_ETHERR) { |
1297 | i596_error(irq, dev_id, regs); | 1297 | i596_error(irq, dev_id); |
1298 | return IRQ_HANDLED; | 1298 | return IRQ_HANDLED; |
1299 | } | 1299 | } |
1300 | } | 1300 | } |