summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-22 07:56:16 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 13:41:47 -0500
commitbf254f685c1c46ad3356534c52c239d1737b2617 (patch)
treec478b53b56dea334b4d3889add19b18aba15942a /drivers
parente9df2018486a895ffe2020f6dbd37ae16141e2f8 (diff)
downloadu-boot-imx-bf254f685c1c46ad3356534c52c239d1737b2617.zip
u-boot-imx-bf254f685c1c46ad3356534c52c239d1737b2617.tar.gz
u-boot-imx-bf254f685c1c46ad3356534c52c239d1737b2617.tar.bz2
drivers/net/natsemi.c: Fix compile warning
Fix this: natsemi.c: In function 'natsemi_initialize': natsemi.c:338: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/natsemi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 9386adf..04743bd 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -237,8 +237,7 @@ static void natsemi_init_txd(struct eth_device *dev);
static void natsemi_init_rxd(struct eth_device *dev);
static void natsemi_set_rx_mode(struct eth_device *dev);
static void natsemi_check_duplex(struct eth_device *dev);
-static int natsemi_send(struct eth_device *dev, volatile void *packet,
- int length);
+static int natsemi_send(struct eth_device *dev, void *packet, int length);
static int natsemi_poll(struct eth_device *dev);
static void natsemi_disable(struct eth_device *dev);
@@ -754,8 +753,7 @@ natsemi_check_duplex(struct eth_device *dev)
* Description: transmits a packet and waits for completion or timeout.
*
* Returns: void. */
-static int
-natsemi_send(struct eth_device *dev, volatile void *packet, int length)
+static int natsemi_send(struct eth_device *dev, void *packet, int length)
{
u32 i, status = 0;
u32 tx_status = 0;