drivers/net/e1000.c: Fix compile warning
authorJoe Hershberger <joe.hershberger@ni.com>
Tue, 22 May 2012 07:56:14 +0000 (07:56 +0000)
committerJoe Hershberger <joe.hershberger@ni.com>
Tue, 22 May 2012 18:41:47 +0000 (13:41 -0500)
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>
drivers/net/e1000.c

index e726f398d4f2e87ea560374fa5252fd73a1530be..94b2a41e1404af4886860c76e1fb5c886068070b 100644 (file)
@@ -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;