summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-22 18:09:56 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 23:17:52 -0500
commitf92a151cd1610e0d78fb64181da90f7cae2e51e8 (patch)
tree35b17f6c03d5cd5f5241a60c68aaa9d0d448e0ae /drivers
parent7a10692a9cb3710cb8233b111f0fcf47b98e9b60 (diff)
drivers/net/pcnet.c: Fix compile warning
Fix this: pcnet.c: In function 'pcnet_initialize': pcnet.c:224:13: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/pcnet.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 45066c8fea..c028a44a9e 100644
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -141,8 +141,7 @@ static int pcnet_check (struct eth_device *dev)
}
static int pcnet_init (struct eth_device *dev, bd_t * bis);
-static int pcnet_send (struct eth_device *dev, volatile void *packet,
- int length);
+static int pcnet_send(struct eth_device *dev, void *packet, int length);
static int pcnet_recv (struct eth_device *dev);
static void pcnet_halt (struct eth_device *dev);
static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_num);
@@ -415,8 +414,7 @@ static int pcnet_init (struct eth_device *dev, bd_t * bis)
return 0;
}
-static int pcnet_send (struct eth_device *dev, volatile void *packet,
- int pkt_len)
+static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
{
int i, status;
struct pcnet_tx_head *entry = &lp->tx_ring[lp->cur_tx];