From: Joe Hershberger <joe.hershberger@ni.com>
Date: Tue, 22 May 2012 07:56:14 +0000 (+0000)
Subject: drivers/net/e1000.c: Fix compile warning
X-Git-Tag: v2012.07-rc1~104
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=97796f718488ac104a5d74ceb7894582c1869b2b;p=oweals%2Fu-boot.git

drivers/net/e1000.c: Fix compile warning

Fix this:
e1000.c: In function 'e1000_initialize':
e1000.c:5264:13: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index e726f398d4..94b2a41e14 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5031,10 +5031,9 @@ e1000_poll(struct eth_device *nic)
 /**************************************************************************
 TRANSMIT - Transmit a frame
 ***************************************************************************/
-static int
-e1000_transmit(struct eth_device *nic, volatile void *packet, int length)
+static int e1000_transmit(struct eth_device *nic, void *packet, int length)
 {
-	void * nv_packet = (void *)packet;
+	void *nv_packet = (void *)packet;
 	struct e1000_hw *hw = nic->priv;
 	struct e1000_tx_desc *txp;
 	int i = 0;