summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-21 14:45:31 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 10:18:16 -0500
commit9d9a89be3af7c5ce3c124f1ddd5470d1cad7c49a (patch)
tree93c28e3b6948b7155cc8c111ee62bc6995f26675 /drivers/net
parent30934b3e5d63aa71a8d3839cc75d9fbee31b5f96 (diff)
drivers/net/macb.c: Fix compile warning
Fix this: macb.c: In function 'macb_eth_initialize': macb.c:564:15: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/macb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index c63eea966a..45784678ba 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -197,8 +197,7 @@ int macb_miiphy_write(const char *devname, u8 phy_adr, u8 reg, u16 value)
#if defined(CONFIG_CMD_NET)
-static int macb_send(struct eth_device *netdev, volatile void *packet,
- int length)
+static int macb_send(struct eth_device *netdev, void *packet, int length)
{
struct macb_device *macb = to_macb(netdev);
unsigned long paddr, ctrl;