summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-22 07:56:18 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 13:41:47 -0500
commit86f3cded06e0ec387ac85a91f760ca479597042d (patch)
treed2954200699181d59fa29cafeff2f16f6c7bca56 /drivers/net
parent7c64a50414c74a3c04c227fce03cabaa13295e80 (diff)
downloadu-boot-imx-86f3cded06e0ec387ac85a91f760ca479597042d.zip
u-boot-imx-86f3cded06e0ec387ac85a91f760ca479597042d.tar.gz
u-boot-imx-86f3cded06e0ec387ac85a91f760ca479597042d.tar.bz2
drivers/net/rtl8139.c: Fix compile warning
Fix this: rtl8139.c: In function 'rtl8139_initialize': rtl8139.c:234:13: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/rtl8139.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index e3feef8..4186699 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -184,7 +184,7 @@ static unsigned char rx_ring[RX_BUF_LEN+16] __attribute__((aligned(4)));
static int rtl8139_probe(struct eth_device *dev, bd_t *bis);
static int read_eeprom(int location, int addr_len);
static void rtl_reset(struct eth_device *dev);
-static int rtl_transmit(struct eth_device *dev, volatile void *packet, int length);
+static int rtl_transmit(struct eth_device *dev, void *packet, int length);
static int rtl_poll(struct eth_device *dev);
static void rtl_disable(struct eth_device *dev);
#ifdef CONFIG_MCAST_TFTP/* This driver already accepts all b/mcast */
@@ -407,7 +407,7 @@ static void rtl_reset(struct eth_device *dev)
outw(0, ioaddr + IntrMask);
}
-static int rtl_transmit(struct eth_device *dev, volatile void *packet, int length)
+static int rtl_transmit(struct eth_device *dev, void *packet, int length)
{
unsigned int status;
unsigned long txstatus;