diff options
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 3 | ||||
-rw-r--r-- | arch/ppc/platforms/sbc82xx.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 1d4b49ad0d7f..2c604d4f6e8b 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -199,7 +199,6 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); | |||
199 | #ifdef CONFIG_USE_MDIO | 199 | #ifdef CONFIG_USE_MDIO |
200 | static void fec_enet_mii(struct net_device *dev); | 200 | static void fec_enet_mii(struct net_device *dev); |
201 | #endif /* CONFIG_USE_MDIO */ | 201 | #endif /* CONFIG_USE_MDIO */ |
202 | static irqreturn_t fec_enet_interrupt(int irq, void * dev_id); | ||
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) | 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; |
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c index cc0935ccab7a..0df6aacb8237 100644 --- a/arch/ppc/platforms/sbc82xx.c +++ b/arch/ppc/platforms/sbc82xx.c | |||
@@ -121,8 +121,10 @@ struct hw_interrupt_type sbc82xx_i8259_ic = { | |||
121 | .end = sbc82xx_i8259_end_irq, | 121 | .end = sbc82xx_i8259_end_irq, |
122 | }; | 122 | }; |
123 | 123 | ||
124 | static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id) | 124 | static irqreturn_t sbc82xx_i8259_demux(int dummy, void *dev_id) |
125 | { | 125 | { |
126 | int irq; | ||
127 | |||
126 | spin_lock(&sbc82xx_i8259_lock); | 128 | spin_lock(&sbc82xx_i8259_lock); |
127 | 129 | ||
128 | sbc82xx_i8259_map[0] = 0x0c; /* OCW3: Read IR register on RD# pulse */ | 130 | sbc82xx_i8259_map[0] = 0x0c; /* OCW3: Read IR register on RD# pulse */ |