summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-21 14:45:22 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 10:18:15 -0500
commit6636c701a07198d1640af35b92cfbd143ad0302b (patch)
tree80a6e3afcf642397dfe1f3f64b949a71a0b219ab
parent9d295177a491c0975b2cf9da32a3007d2c4da7e0 (diff)
downloadu-boot-imx-6636c701a07198d1640af35b92cfbd143ad0302b.zip
u-boot-imx-6636c701a07198d1640af35b92cfbd143ad0302b.tar.gz
u-boot-imx-6636c701a07198d1640af35b92cfbd143ad0302b.tar.bz2
drivers/net/dc2114x.c: Fix compile warning
Fix this: dc2114x.c: In function 'dc21x4x_initialize': dc2114x.c:305:15: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com>
-rw-r--r--drivers/net/dc2114x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 0fb616a..d9fcb5a 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -175,7 +175,7 @@ static void read_hw_addr(struct eth_device* dev, bd_t * bis);
static void send_setup_frame(struct eth_device* dev, bd_t * bis);
static int dc21x4x_init(struct eth_device* dev, bd_t* bis);
-static int dc21x4x_send(struct eth_device* dev, volatile void *packet, int length);
+static int dc21x4x_send(struct eth_device *dev, void *packet, int length);
static int dc21x4x_recv(struct eth_device* dev);
static void dc21x4x_halt(struct eth_device* dev);
#ifdef CONFIG_TULIP_SELECT_MEDIA
@@ -390,7 +390,7 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
return 0;
}
-static int dc21x4x_send(struct eth_device* dev, volatile void *packet, int length)
+static int dc21x4x_send(struct eth_device *dev, void *packet, int length)
{
int status = -1;
int i;