Merge branch 'master' of git://git.denx.de/u-boot-coldfire

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

diff --git a/drivers/net/bcm570x.c b/drivers/net/bcm570x.c
index 5ad31d1fdb6e29145ec4ed7e944f053a89fe1cd8..6b28b95ebc6418471594252c817f016dead63065 100644 (file)
--- a/drivers/net/bcm570x.c
+++ b/drivers/net/bcm570x.c
@@ -6,9 +6,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_CMD_NET) \
-       && (!defined(CONFIG_NET_MULTI)) && defined(CONFIG_BCM570x)
-
 #ifdef CONFIG_BMW
 #include <mpc824x.h>
 #endif
@@ -1599,5 +1596,3 @@ PQQ_ENTRY QQ_GetTail (PQQ_CONTAINER pQueue, unsigned int Idx)
 
        return pQueue->Array[Idx];
 }
-
-#endif