Merge commit 'origin/master'

[oweals/u-boot.git] / drivers / dc2114x.c

diff --git a/drivers/dc2114x.c b/drivers/dc2114x.c
index 844cc8df5d7f1ca677811d6753724502a137defb..d5275dceb0fb6a8603f4881b16d32d4dc40fe4f8 100644 (file)
--- a/drivers/dc2114x.c
+++ b/drivers/dc2114x.c
@@ -20,7 +20,7 @@
 
 #include <common.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+#if defined(CONFIG_CMD_NET) \
        && defined(CONFIG_NET_MULTI) && defined(CONFIG_TULIP)
 
 #include <malloc.h>
@@ -768,4 +768,4 @@ static void update_srom(struct eth_device *dev, bd_t *bis)
 }
 #endif /* UPDATE_SROM */
 
-#endif /* CFG_CMD_NET && CONFIG_NET_MULTI && CONFIG_TULIP */
+#endif