diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 07:48:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-09 21:55:25 -0400 |
commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /arch/ppc/8xx_io/fec.c | |
parent | 8de242e60a441f177dd51b323894b17d3d63e9f2 (diff) |
[POWERPC] ARCH=ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/8xx_io/fec.c')
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 8b6295bbb564..2f9fa9e3d331 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -198,8 +198,7 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); | |||
198 | #ifdef CONFIG_USE_MDIO | 198 | #ifdef CONFIG_USE_MDIO |
199 | static void fec_enet_mii(struct net_device *dev); | 199 | static void fec_enet_mii(struct net_device *dev); |
200 | #endif /* CONFIG_USE_MDIO */ | 200 | #endif /* CONFIG_USE_MDIO */ |
201 | static irqreturn_t fec_enet_interrupt(int irq, void * dev_id, | 201 | static irqreturn_t fec_enet_interrupt(int irq, void * dev_id); |
202 | struct pt_regs * regs); | ||
203 | #ifdef CONFIG_FEC_PACKETHOOK | 202 | #ifdef CONFIG_FEC_PACKETHOOK |
204 | static void fec_enet_tx(struct net_device *dev, __u32 regval); | 203 | static void fec_enet_tx(struct net_device *dev, __u32 regval); |
205 | static void fec_enet_rx(struct net_device *dev, __u32 regval); | 204 | static void fec_enet_rx(struct net_device *dev, __u32 regval); |
@@ -472,7 +471,7 @@ fec_timeout(struct net_device *dev) | |||
472 | * This is called from the MPC core interrupt. | 471 | * This is called from the MPC core interrupt. |
473 | */ | 472 | */ |
474 | static irqreturn_t | 473 | static irqreturn_t |
475 | fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 474 | fec_enet_interrupt(int irq, void * dev_id) |
476 | { | 475 | { |
477 | struct net_device *dev = dev_id; | 476 | struct net_device *dev = dev_id; |
478 | volatile fec_t *fecp; | 477 | volatile fec_t *fecp; |
@@ -1408,7 +1407,7 @@ static | |||
1408 | #ifdef CONFIG_RPXCLASSIC | 1407 | #ifdef CONFIG_RPXCLASSIC |
1409 | void mii_link_interrupt(void *dev_id) | 1408 | void mii_link_interrupt(void *dev_id) |
1410 | #else | 1409 | #else |
1411 | irqreturn_t mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 1410 | irqreturn_t mii_link_interrupt(int irq, void * dev_id) |
1412 | #endif | 1411 | #endif |
1413 | { | 1412 | { |
1414 | #ifdef CONFIG_USE_MDIO | 1413 | #ifdef CONFIG_USE_MDIO |