summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-22 07:56:20 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 13:41:47 -0500
commit4b94215007ae99b75f7deff651f9aac0cb89b103 (patch)
treece352862c7937e6f802e1a4e0075ab8a960daba2
parente5c83f330448f05b8e6eb5d2373d12361c6d9562 (diff)
downloadu-boot-imx-4b94215007ae99b75f7deff651f9aac0cb89b103.zip
u-boot-imx-4b94215007ae99b75f7deff651f9aac0cb89b103.tar.gz
u-boot-imx-4b94215007ae99b75f7deff651f9aac0cb89b103.tar.bz2
drivers/net/uli526x.c: Fix compile warning
Fix this: uli526x.c: In function 'uli526x_initialize': uli526x.c:243:13: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--drivers/net/uli526x.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 5933bdd..9648901 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -168,8 +168,7 @@ static char buf_pool[TX_BUF_ALLOC * TX_DESC_CNT + 4];
static int mode = 8;
/* function declaration -- */
-static int uli526x_start_xmit(struct eth_device *dev,
- volatile void *packet, int length);
+static int uli526x_start_xmit(struct eth_device *dev, void *packet, int length);
static const struct ethtool_ops netdev_ethtool_ops;
static u16 read_srom_word(long, int);
static void uli526x_descriptor_init(struct uli526x_board_info *, unsigned long);
@@ -443,8 +442,7 @@ static void uli526x_init(struct eth_device *dev)
* Send a packet to media from the upper layer.
*/
-static int uli526x_start_xmit(struct eth_device *dev,
- volatile void *packet, int length)
+static int uli526x_start_xmit(struct eth_device *dev, void *packet, int length)
{
struct uli526x_board_info *db = dev->priv;
struct tx_desc *txptr;