diff options
Diffstat (limited to 'drivers/net/fec.c')
-rw-r--r-- | drivers/net/fec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 55d86bc4c104..6764281b4531 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
@@ -229,7 +229,7 @@ struct fec_enet_private { | |||
229 | static int fec_enet_open(struct net_device *dev); | 229 | static int fec_enet_open(struct net_device *dev); |
230 | static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); | 230 | static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); |
231 | static void fec_enet_mii(struct net_device *dev); | 231 | static void fec_enet_mii(struct net_device *dev); |
232 | static irqreturn_t fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs); | 232 | static irqreturn_t fec_enet_interrupt(int irq, void * dev_id); |
233 | static void fec_enet_tx(struct net_device *dev); | 233 | static void fec_enet_tx(struct net_device *dev); |
234 | static void fec_enet_rx(struct net_device *dev); | 234 | static void fec_enet_rx(struct net_device *dev); |
235 | static int fec_enet_close(struct net_device *dev); | 235 | static int fec_enet_close(struct net_device *dev); |
@@ -450,7 +450,7 @@ fec_timeout(struct net_device *dev) | |||
450 | * This is called from the MPC core interrupt. | 450 | * This is called from the MPC core interrupt. |
451 | */ | 451 | */ |
452 | static irqreturn_t | 452 | static irqreturn_t |
453 | fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 453 | fec_enet_interrupt(int irq, void * dev_id) |
454 | { | 454 | { |
455 | struct net_device *dev = dev_id; | 455 | struct net_device *dev = dev_id; |
456 | volatile fec_t *fecp; | 456 | volatile fec_t *fecp; |
@@ -1236,7 +1236,7 @@ static void | |||
1236 | mii_link_interrupt(void *dev_id); | 1236 | mii_link_interrupt(void *dev_id); |
1237 | #else | 1237 | #else |
1238 | static irqreturn_t | 1238 | static irqreturn_t |
1239 | mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs); | 1239 | mii_link_interrupt(int irq, void * dev_id); |
1240 | #endif | 1240 | #endif |
1241 | #endif | 1241 | #endif |
1242 | 1242 | ||
@@ -1251,7 +1251,7 @@ static void __inline__ fec_request_intrs(struct net_device *dev) | |||
1251 | static const struct idesc { | 1251 | static const struct idesc { |
1252 | char *name; | 1252 | char *name; |
1253 | unsigned short irq; | 1253 | unsigned short irq; |
1254 | irqreturn_t (*handler)(int, void *, struct pt_regs *); | 1254 | irq_handler_t handler; |
1255 | } *idp, id[] = { | 1255 | } *idp, id[] = { |
1256 | { "fec(RX)", 86, fec_enet_interrupt }, | 1256 | { "fec(RX)", 86, fec_enet_interrupt }, |
1257 | { "fec(TX)", 87, fec_enet_interrupt }, | 1257 | { "fec(TX)", 87, fec_enet_interrupt }, |
@@ -2117,7 +2117,7 @@ static void | |||
2117 | mii_link_interrupt(void *dev_id) | 2117 | mii_link_interrupt(void *dev_id) |
2118 | #else | 2118 | #else |
2119 | static irqreturn_t | 2119 | static irqreturn_t |
2120 | mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 2120 | mii_link_interrupt(int irq, void * dev_id) |
2121 | #endif | 2121 | #endif |
2122 | { | 2122 | { |
2123 | struct net_device *dev = dev_id; | 2123 | struct net_device *dev = dev_id; |