summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Linz <linz@li-pro.net>2012-05-22 12:18:11 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 23:17:52 -0500
commit8d094e5f269fce3b81301c87ce4811da12b7871a (patch)
treec8fa5b6a5f415362e1bcf7ecb192e6f1a15af838
parent1ae6b9c4e0889b67e54fe2f3fa6a776ad21cf773 (diff)
downloadtalos-obmc-uboot-8d094e5f269fce3b81301c87ce4811da12b7871a.tar.gz
talos-obmc-uboot-8d094e5f269fce3b81301c87ce4811da12b7871a.zip
drivers/net/xilinx_axi_emac.c: Fix compile warning
Fix this: xilinx_axi_emac.c: In function 'xilinx_axiemac_initialize': xilinx_axi_emac.c:646: warning: assignment from incompatible pointer type Signed-off-by: Stephan Linz <linz@li-pro.net>
-rw-r--r--drivers/net/xilinx_axi_emac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c
index 82e254b529..7854a04cae 100644
--- a/drivers/net/xilinx_axi_emac.c
+++ b/drivers/net/xilinx_axi_emac.c
@@ -468,7 +468,7 @@ static int axiemac_init(struct eth_device *dev, bd_t * bis)
return 0;
}
-static int axiemac_send(struct eth_device *dev, volatile void *ptr, int len)
+static int axiemac_send(struct eth_device *dev, void *ptr, int len)
{
struct axidma_priv *priv = dev->priv;
u32 timeout;
OpenPOWER on IntegriCloud