Merge commit 'wd/master'

[oweals/u-boot.git] / drivers / net / rtl8169.c

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index d39ac7c4c1bc97b64d1029f4783de8c8196231c6..d069afbe227b6f414f662c120713c15f85a21d85 100644 (file)
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -58,9 +58,6 @@
 #include <asm/io.h>
 #include <pci.h>
 
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_RTL8169)
-
 #undef DEBUG_RTL8169
 #undef DEBUG_RTL8169_TX
 #undef DEBUG_RTL8169_RX
@@ -395,7 +392,7 @@ static int rtl8169_init_board(struct eth_device *dev)
 
        /* if unknown chip, assume array element #0, original RTL-8169 in this case */
        printf("PCI device %s: unknown chip version, assuming RTL-8169\n", dev->name);
-       printf("PCI device: TxConfig = 0x%hX\n", (unsigned long) RTL_R32(TxConfig));
+       printf("PCI device: TxConfig = 0x%lX\n", (unsigned long) RTL_R32(TxConfig));
        tpc->chipset = 0;
 
 match:
@@ -435,7 +432,7 @@ static int rtl_recv(struct eth_device *dev)
                                tpc->RxDescArray[cur_rx].status =
                                        cpu_to_le32(OWNbit + RX_BUF_SIZE);
                        tpc->RxDescArray[cur_rx].buf_addr =
-                               cpu_to_le32(tpc->RxBufferRing[cur_rx]);
+                               cpu_to_le32((unsigned long)tpc->RxBufferRing[cur_rx]);
                } else {
                        puts("Error Rx");
                }
@@ -481,7 +478,7 @@ static int rtl_send(struct eth_device *dev, volatile void *packet, int length)
        while (len < ETH_ZLEN)
                ptxb[len++] = '\0';
 
-       tpc->TxDescArray[entry].buf_addr = cpu_to_le32(ptxb);
+       tpc->TxDescArray[entry].buf_addr = cpu_to_le32((unsigned long)ptxb);
        if (entry != (NUM_TX_DESC - 1)) {
                tpc->TxDescArray[entry].status =
                        cpu_to_le32((OWNbit | FSbit | LSbit) |
@@ -579,8 +576,8 @@ static void rtl8169_hw_start(struct eth_device *dev)
 
        tpc->cur_rx = 0;
 
-       RTL_W32(TxDescStartAddr, tpc->TxDescArray);
-       RTL_W32(RxDescStartAddr, tpc->RxDescArray);
+       RTL_W32(TxDescStartAddr, (unsigned long)tpc->TxDescArray);
+       RTL_W32(RxDescStartAddr, (unsigned long)tpc->RxDescArray);
        RTL_W8(Cfg9346, Cfg9346_Lock);
        udelay(10);
 
@@ -625,7 +622,7 @@ static void rtl8169_init_ring(struct eth_device *dev)
 
                tpc->RxBufferRing[i] = &rxb[i * RX_BUF_SIZE];
                tpc->RxDescArray[i].buf_addr =
-                       cpu_to_le32(tpc->RxBufferRing[i]);
+                       cpu_to_le32((unsigned long)tpc->RxBufferRing[i]);
        }
 
 #ifdef DEBUG_RTL8169
@@ -887,5 +884,3 @@ int rtl8169_initialize(bd_t *bis)
        }
        return card_number;
 }
-
-#endif