Merge commit 'wd/master'

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

diff --git a/drivers/net/tigon3.c b/drivers/net/tigon3.c
index 5f6a4ecd0abe84de297b9ba0bfdbdc66c2bf2a0a..ab448b0f810cddd92b3b68da8ca9d6c03f4e495f 100644 (file)
--- a/drivers/net/tigon3.c
+++ b/drivers/net/tigon3.c
@@ -12,8 +12,7 @@
 /******************************************************************************/
 #include <common.h>
 #include <asm/types.h>
-#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_TIGON3)
+
 #ifdef CONFIG_BMW
 #include <mpc824x.h>
 #endif
@@ -5695,5 +5694,3 @@ LM_DmaTest (PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
        }
        return LM_STATUS_SUCCESS;
 }
-
-#endif