commit d5be43de93ff905c465e509d45a3164ef48d26e7
author Jon Loeliger <jdl@jdl.com> Mon Jun 11 19:02:10 2007 -0500
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 00:23:11 2007 +0200
tree 8adf5e095118afadc4b2f770daad386df1da3f4e
parent b453960d4fdb87b3970d96119b90df2ed024fc4a

drivers/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.

All transformations are of the form:
Before:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

Signed-off-by: Jon Loeliger <jdl@freescale.com>

drivers/e1000.c

diff --git a/drivers/e1000.c b/drivers/e1000.c
index 927acbb..1ba7660 100644
--- a/drivers/e1000.c
+++ b/drivers/e1000.c
@@ -44,8 +44,8 @@
 
 #include "e1000.h"
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-	defined(CONFIG_E1000)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET)  || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000)
 
 #define TOUT_LOOP   100000