summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-22 07:56:17 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 13:41:47 -0500
commit7c64a50414c74a3c04c227fce03cabaa13295e80 (patch)
tree99fc083bc79182c5b570a89338436aeced150f65
parentbf254f685c1c46ad3356534c52c239d1737b2617 (diff)
drivers/net/ns8382x.c: Fix compile warning
Fix this: ns8382x.c: In function 'ns8382x_initialize': ns8382x.c:352:13: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--drivers/net/ns8382x.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ns8382x.c b/drivers/net/ns8382x.c
index 11863feba3d..cfe1f349db8 100644
--- a/drivers/net/ns8382x.c
+++ b/drivers/net/ns8382x.c
@@ -258,8 +258,7 @@ static void ns8382x_init_txd(struct eth_device *dev);
static void ns8382x_init_rxd(struct eth_device *dev);
static void ns8382x_set_rx_mode(struct eth_device *dev);
static void ns8382x_check_duplex(struct eth_device *dev);
-static int ns8382x_send(struct eth_device *dev, volatile void *packet,
- int length);
+static int ns8382x_send(struct eth_device *dev, void *packet, int length);
static int ns8382x_poll(struct eth_device *dev);
static void ns8382x_disable(struct eth_device *dev);
@@ -735,8 +734,7 @@ ns8382x_check_duplex(struct eth_device *dev)
/* Function: ns8382x_send
* Description: transmits a packet and waits for completion or timeout.
* Returns: void. */
-static int
-ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
+static int ns8382x_send(struct eth_device *dev, void *packet, int length)
{
u32 i, status = 0;
vu_long tx_stat = 0;