aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-11-22 09:48:45 +0100
committerWolfgang Denk <wd@denx.de>2010-11-26 22:08:18 +0100
commit8aa858cbc0c85738961a2ac4a98c188582c29ff4 (patch)
tree8aa9cd7203dc30ee345190e6966a04a1fe36153a
parentafaa27bdd6f4f9c19b569b2586c18a958d18ffc6 (diff)
downloadu-boot-linaro-natty-8aa858cbc0c85738961a2ac4a98c188582c29ff4.tar.gz
e1000: fix compile warning
Get rid of compiler warning: e1000.c: In function 'e1000_transmit': e1000.c:5028: warning: passing argument 1 of 'virt_to_phys' discards qualifiers from pointer target type Signed-off-by: Wolfgang Denk <wd@denx.de> Acked-by: Stefan Roese <sr@denx.de>
-rw-r--r--drivers/net/e1000.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 60b04c267..5f390bddb 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5018,6 +5018,7 @@ TRANSMIT - Transmit a frame
static int
e1000_transmit(struct eth_device *nic, volatile void *packet, int length)
{
+ void * nv_packet = (void *)packet;
struct e1000_hw *hw = nic->priv;
struct e1000_tx_desc *txp;
int i = 0;
@@ -5025,7 +5026,7 @@ e1000_transmit(struct eth_device *nic, volatile void *packet, int length)
txp = tx_base + tx_tail;
tx_tail = (tx_tail + 1) % 8;
- txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, packet));
+ txp->buffer_addr = cpu_to_le64(virt_to_bus(hw->pdev, nv_packet));
txp->lower.data = cpu_to_le32(hw->txd_cmd | length);
txp->upper.data = 0;
E1000_WRITE_REG(hw, TDT, tx_tail);