summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorStephan Linz <linz@li-pro.net>2012-05-22 12:18:09 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 23:17:52 -0500
commitf22ff1ab09ee906790f08dea2942686c8370ac3d (patch)
tree32ba8805cce6d1db31ccbfefcc2cdd91d636a686 /drivers/net
parentbb901574922dcf9c97c33bc04fba3ba539397527 (diff)
downloadu-boot-imx-f22ff1ab09ee906790f08dea2942686c8370ac3d.zip
u-boot-imx-f22ff1ab09ee906790f08dea2942686c8370ac3d.tar.gz
u-boot-imx-f22ff1ab09ee906790f08dea2942686c8370ac3d.tar.bz2
drivers/net/xilinx_ll_temac.c: Fix compile warning
Fix this: xilinx_ll_temac.c: In function 'xilinx_ll_temac_initialize': xilinx_ll_temac.c:332: warning: assignment from incompatible pointer type xilinx_ll_temac.c:340: warning: assignment from incompatible pointer type Signed-off-by: Stephan Linz <linz@li-pro.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/xilinx_ll_temac_fifo.c3
-rw-r--r--drivers/net/xilinx_ll_temac_fifo.h3
-rw-r--r--drivers/net/xilinx_ll_temac_sdma.c3
-rw-r--r--drivers/net/xilinx_ll_temac_sdma.h3
4 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/xilinx_ll_temac_fifo.c b/drivers/net/xilinx_ll_temac_fifo.c
index 3ff0f34..d7fd989 100644
--- a/drivers/net/xilinx_ll_temac_fifo.c
+++ b/drivers/net/xilinx_ll_temac_fifo.c
@@ -102,8 +102,7 @@ int ll_temac_recv_fifo(struct eth_device *dev)
return 0;
}
-int ll_temac_send_fifo(struct eth_device *dev, volatile void *packet,
- int length)
+int ll_temac_send_fifo(struct eth_device *dev, void *packet, int length)
{
int i;
u32 *buf = (u32 *)packet;
diff --git a/drivers/net/xilinx_ll_temac_fifo.h b/drivers/net/xilinx_ll_temac_fifo.h
index f0d6e68..e5b4be9 100644
--- a/drivers/net/xilinx_ll_temac_fifo.h
+++ b/drivers/net/xilinx_ll_temac_fifo.h
@@ -116,7 +116,6 @@ int ll_temac_reset_fifo(struct eth_device *dev);
int ll_temac_recv_fifo(struct eth_device *dev);
/* send buffered data to FIFO */
-int ll_temac_send_fifo(struct eth_device *dev, volatile void *packet,
- int length);
+int ll_temac_send_fifo(struct eth_device *dev, void *packet, int length);
#endif /* _XILINX_LL_TEMAC_FIFO_ */
diff --git a/drivers/net/xilinx_ll_temac_sdma.c b/drivers/net/xilinx_ll_temac_sdma.c
index 621d100..8637a6b 100644
--- a/drivers/net/xilinx_ll_temac_sdma.c
+++ b/drivers/net/xilinx_ll_temac_sdma.c
@@ -324,8 +324,7 @@ int ll_temac_recv_sdma(struct eth_device *dev)
return 0;
}
-int ll_temac_send_sdma(struct eth_device *dev, volatile void *packet,
- int length)
+int ll_temac_send_sdma(struct eth_device *dev, void *packet, int length)
{
unsigned timeout = 50; /* 1usec * 50 = 50usec */
struct cdmac_bd *tx_dp = &cdmac_bd.tx[tx_idx];
diff --git a/drivers/net/xilinx_ll_temac_sdma.h b/drivers/net/xilinx_ll_temac_sdma.h
index 51e258d..db00a57 100644
--- a/drivers/net/xilinx_ll_temac_sdma.h
+++ b/drivers/net/xilinx_ll_temac_sdma.h
@@ -275,7 +275,6 @@ int ll_temac_reset_sdma(struct eth_device *dev);
int ll_temac_recv_sdma(struct eth_device *dev);
/* send buffered data to SDMA */
-int ll_temac_send_sdma(struct eth_device *dev, volatile void *packet,
- int length);
+int ll_temac_send_sdma(struct eth_device *dev, void *packet, int length);
#endif /* _XILINX_LL_TEMAC_SDMA_ */