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/8260_io | |
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/8260_io')
-rw-r--r-- | arch/ppc/8260_io/enet.c | 4 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index ac6d55fe2235..a6056c29cf00 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -122,7 +122,7 @@ struct scc_enet_private { | |||
122 | static int scc_enet_open(struct net_device *dev); | 122 | static int scc_enet_open(struct net_device *dev); |
123 | static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); | 123 | static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); |
124 | static int scc_enet_rx(struct net_device *dev); | 124 | static int scc_enet_rx(struct net_device *dev); |
125 | static irqreturn_t scc_enet_interrupt(int irq, void *dev_id, struct pt_regs *); | 125 | static irqreturn_t scc_enet_interrupt(int irq, void *dev_id); |
126 | static int scc_enet_close(struct net_device *dev); | 126 | static int scc_enet_close(struct net_device *dev); |
127 | static struct net_device_stats *scc_enet_get_stats(struct net_device *dev); | 127 | static struct net_device_stats *scc_enet_get_stats(struct net_device *dev); |
128 | static void set_multicast_list(struct net_device *dev); | 128 | static void set_multicast_list(struct net_device *dev); |
@@ -273,7 +273,7 @@ scc_enet_timeout(struct net_device *dev) | |||
273 | * This is called from the CPM handler, not the MPC core interrupt. | 273 | * This is called from the CPM handler, not the MPC core interrupt. |
274 | */ | 274 | */ |
275 | static irqreturn_t | 275 | static irqreturn_t |
276 | scc_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 276 | scc_enet_interrupt(int irq, void * dev_id) |
277 | { | 277 | { |
278 | struct net_device *dev = dev_id; | 278 | struct net_device *dev = dev_id; |
279 | volatile struct scc_enet_private *cep; | 279 | volatile struct scc_enet_private *cep; |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index e347fe88316d..2e1943e27819 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -140,7 +140,7 @@ typedef struct { | |||
140 | static int fcc_enet_open(struct net_device *dev); | 140 | static int fcc_enet_open(struct net_device *dev); |
141 | static int fcc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); | 141 | static int fcc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); |
142 | static int fcc_enet_rx(struct net_device *dev); | 142 | static int fcc_enet_rx(struct net_device *dev); |
143 | static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id, struct pt_regs *); | 143 | static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id); |
144 | static int fcc_enet_close(struct net_device *dev); | 144 | static int fcc_enet_close(struct net_device *dev); |
145 | static struct net_device_stats *fcc_enet_get_stats(struct net_device *dev); | 145 | static struct net_device_stats *fcc_enet_get_stats(struct net_device *dev); |
146 | /* static void set_multicast_list(struct net_device *dev); */ | 146 | /* static void set_multicast_list(struct net_device *dev); */ |
@@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev) | |||
524 | 524 | ||
525 | /* The interrupt handler. */ | 525 | /* The interrupt handler. */ |
526 | static irqreturn_t | 526 | static irqreturn_t |
527 | fcc_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 527 | fcc_enet_interrupt(int irq, void * dev_id) |
528 | { | 528 | { |
529 | struct net_device *dev = dev_id; | 529 | struct net_device *dev = dev_id; |
530 | volatile struct fcc_enet_private *cep; | 530 | volatile struct fcc_enet_private *cep; |
@@ -1563,7 +1563,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) | |||
1563 | #ifdef PHY_INTERRUPT | 1563 | #ifdef PHY_INTERRUPT |
1564 | /* This interrupt occurs when the PHY detects a link change. */ | 1564 | /* This interrupt occurs when the PHY detects a link change. */ |
1565 | static irqreturn_t | 1565 | static irqreturn_t |
1566 | mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 1566 | mii_link_interrupt(int irq, void * dev_id) |
1567 | { | 1567 | { |
1568 | struct net_device *dev = dev_id; | 1568 | struct net_device *dev = dev_id; |
1569 | struct fcc_enet_private *fep = dev->priv; | 1569 | struct fcc_enet_private *fep = dev->priv; |