summaryrefslogtreecommitdiff
path: root/drivers/net/e1000.c
diff options
context:
space:
mode:
authorShinya Kuribayashi <skuribay@ruby.dti.ne.jp>2008-06-09 23:37:44 +0900
committerBen Warren <biggerbadderben@gmail.com>2008-06-09 23:21:05 -0700
commit3b904ccb93c3196727e2e9870cb1df903cab19ad (patch)
treecdba708c7c336b6a20c22a392a7160e21cd538e4 /drivers/net/e1000.c
parente44f3ea4e801d37ef293284cb57b9637382f211a (diff)
downloadu-boot-imx-3b904ccb93c3196727e2e9870cb1df903cab19ad.zip
u-boot-imx-3b904ccb93c3196727e2e9870cb1df903cab19ad.tar.gz
u-boot-imx-3b904ccb93c3196727e2e9870cb1df903cab19ad.tar.bz2
net: Conditional COBJS inclusion of network drivers
Replace COBJS-y with appropriate driver config names. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers/net/e1000.c')
-rw-r--r--drivers/net/e1000.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 40a781f..c31029a 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -44,9 +44,6 @@ tested on both gig copper and gig fiber boards
#include "e1000.h"
-#if defined(CONFIG_CMD_NET) \
- && defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000)
-
#define TOUT_LOOP 100000
#undef virt_to_bus
@@ -3061,5 +3058,3 @@ e1000_initialize(bd_t * bis)
}
return 1;
}
-
-#endif