diff options
| author |   Al Viro <viro@ftp.linux.org.uk> | 2006-10-09 12:48:42 +0100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-10-10 11:55:25 +1000 |
| commit | 39e3eb7265b8698e5f607a317af13c9478274736 (patch) | |
| tree | 927b34392c7d74b38d52749c2311f6dfe7285851 /arch/ppc/8xx_io/fec.c | |
| parent | [POWERPC] Update maple defconfig (diff) | |
| download | linux-dev-39e3eb7265b8698e5f607a317af13c9478274736.tar.xz linux-dev-39e3eb7265b8698e5f607a317af13c9478274736.zip | |
[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); #ifdef CONFIG_USE_MDIO static void fec_enet_mii(struct net_device *dev); #endif /* CONFIG_USE_MDIO */ -static irqreturn_t fec_enet_interrupt(int irq, void * dev_id, - struct pt_regs * regs); +static irqreturn_t fec_enet_interrupt(int irq, void * dev_id); #ifdef CONFIG_FEC_PACKETHOOK static void fec_enet_tx(struct net_device *dev, __u32 regval); static void fec_enet_rx(struct net_device *dev, __u32 regval); @@ -472,7 +471,7 @@ fec_timeout(struct net_device *dev) * This is called from the MPC core interrupt. */ static irqreturn_t -fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) +fec_enet_interrupt(int irq, void * dev_id) { struct net_device *dev = dev_id; volatile fec_t *fecp; @@ -1408,7 +1407,7 @@ static #ifdef CONFIG_RPXCLASSIC void mii_link_interrupt(void *dev_id) #else -irqreturn_t mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) +irqreturn_t mii_link_interrupt(int irq, void * dev_id) #endif { #ifdef CONFIG_USE_MDIO |