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

[karo-tx-uboot.git] / drivers / e1000.c

diff --git a/drivers/e1000.c b/drivers/e1000.c
index 927acbb26737a20e02962f67047e192545a870a1..f0741da82b29b49bc054b0d8b34a4798bc6131e4 100644 (file)
--- a/drivers/e1000.c
+++ b/drivers/e1000.c
@@ -44,8 +44,8 @@ tested on both gig copper and gig fiber boards
 
 #include "e1000.h"
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_E1000)
+#if defined(CONFIG_CMD_NET) \
+       && defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000)
 
 #define TOUT_LOOP   100000