From 1b10d0717a381ebf263e44488107dce40f75f4fb Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Sun, 20 May 2012 21:14:54 +0000 Subject: MPC8xx: fix "Remove volatile from net API" aftermath Commit db288a9 "net: Remove volatile from net API" caused a number of build warnings: fec.c: In function 'fec_initialize': fec.c:183:13: warning: assignment from incompatible pointer type [enabled by default] fec.c: In function 'fec_recv': fec.c:284:5: warning: passing argument 1 of 'NetReceive' discards 'volatile' qualifier from pointer target type [enabled by default] /home/wd/git/u-boot/work/include/net.h:433:13: note: expected 'uchar *' but argument is of type 'volatile uchar *' scc.c: In function 'scc_initialize': scc.c:85:14: warning: assignment from incompatible pointer type [enabled by default] Fix these. Signed-off-by: Wolfgang Denk Cc: Joe Hershberger --- arch/powerpc/cpu/mpc8xx/scc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/powerpc/cpu/mpc8xx/scc.c') diff --git a/arch/powerpc/cpu/mpc8xx/scc.c b/arch/powerpc/cpu/mpc8xx/scc.c index e376c64d5..2c93e24f3 100644 --- a/arch/powerpc/cpu/mpc8xx/scc.c +++ b/arch/powerpc/cpu/mpc8xx/scc.c @@ -65,7 +65,7 @@ typedef volatile struct CommonBufferDescriptor { static RTXBD *rtx; -static int scc_send(struct eth_device* dev, volatile void *packet, int length); +static int scc_send(struct eth_device *dev, void *packet, int length); static int scc_recv(struct eth_device* dev); static int scc_init (struct eth_device* dev, bd_t * bd); static void scc_halt(struct eth_device* dev); @@ -90,7 +90,7 @@ int scc_initialize(bd_t *bis) return 1; } -static int scc_send(struct eth_device* dev, volatile void *packet, int length) +static int scc_send(struct eth_device *dev, void *packet, int length) { int i, j=0; #if 0 -- cgit v1.2.3-70-g09d2