diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-22 07:56:14 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-22 13:41:47 -0500 |
| commit | 97796f718488ac104a5d74ceb7894582c1869b2b (patch) | |
| tree | fe78a1d151e8f7e6bee8f4fac12f7383dade428f /drivers/net/e1000.c | |
| parent | 9aabb2f88bec8549194b8e302b22a1aacefc5ffd (diff) | |
| download | olio-uboot-2014.01-97796f718488ac104a5d74ceb7894582c1869b2b.tar.xz olio-uboot-2014.01-97796f718488ac104a5d74ceb7894582c1869b2b.zip | |
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>
Diffstat (limited to 'drivers/net/e1000.c')
| -rw-r--r-- | drivers/net/e1000.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index e726f398d..94b2a41e1 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; |