Merge with git://www.denx.de/git/u-boot.git

[platform/kernel/u-boot.git] / drivers / ns8382x.c

diff --git a/drivers/ns8382x.c b/drivers/ns8382x.c
index 281940b..f8b143a 100644 (file)
--- a/drivers/ns8382x.c
+++ b/drivers/ns8382x.c
@@ -56,8 +56,8 @@
 #include <asm/io.h>
 #include <pci.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_NS8382X)
+#if defined(CONFIG_CMD_NET) \
+       && defined(CONFIG_NET_MULTI) && defined(CONFIG_NS8382X)
 
 /* defines */
 #define DSIZE     0x00000FFF
@@ -363,7 +363,7 @@ ns8382x_initialize(bd_t * bis)
                /* get MAC address */
                for (i = 0; i < 3; i++) {
                        u32 data;
-                       char *mac = &dev->enetaddr[i * 2];
+                       char *mac = (char *)&dev->enetaddr[i * 2];
 
                        OUTL(dev, i * 2, RxFilterAddr);
                        data = INL(dev, RxFilterData);
@@ -745,7 +745,7 @@ static int
 ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
 {
        u32 i, status = 0;
-       u32 tx_stat = 0;
+       vu_long tx_stat = 0;
 
        /* Stop the transmitter */
        OUTL(dev, TxOff, ChipCmd);
@@ -771,7 +771,7 @@ ns8382x_send(struct eth_device *dev, volatile void *packet, int length)
        /* restart the transmitter */
        OUTL(dev, TxOn, ChipCmd);
 
-       for (i = 0; ((vu_long)tx_stat = le32_to_cpu(txd.cmdsts)) & DescOwn; i++) {
+       for (i = 0; (tx_stat = le32_to_cpu(txd.cmdsts)) & DescOwn; i++) {
                if (i >= TOUT_LOOP) {
                        printf ("%s: tx error buffer not ready: txd.cmdsts %#X\n",
                             dev->name, tx_stat);