From 3b904ccb93c3196727e2e9870cb1df903cab19ad Mon Sep 17 00:00:00 2001
From: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date: Mon, 9 Jun 2008 23:37:44 +0900
Subject: 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>
---
 drivers/net/e1000.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'drivers/net/e1000.c')

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
-- 
cgit v1.1