[U-Boot-Users] [PATCH 4/10] net: Conditional COBJS inclusion of INCA-IP switch

[Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>]

net: Conditional COBJS inclusion of INCA-IP switch

From: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---

 drivers/net/Makefile     |    2 +-
 drivers/net/inca-ip_sw.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)


diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 432fc10..35c1490 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -36,7 +36,7 @@ COBJS-$(CONFIG_EEPRO100) += eepro100.o
 COBJS-y += enc28j60.o
 COBJS-y += fsl_mcdmafec.o
 COBJS-$(CONFIG_GRETH) += greth.o
-COBJS-y += inca-ip_sw.o
+COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o
 COBJS-y += ks8695eth.o
 COBJS-y += lan91c96.o
 COBJS-y += macb.o
diff --git a/drivers/net/inca-ip_sw.c b/drivers/net/inca-ip_sw.c
index a079b60..d852a15 100644
--- a/drivers/net/inca-ip_sw.c
+++ b/drivers/net/inca-ip_sw.c
@@ -26,9 +26,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_CMD_NET) \
-	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_INCA_IP_SWITCH)
-
 #include <malloc.h>
 #include <net.h>
 #include <asm/inca-ip.h>
@@ -813,5 +810,3 @@ Fail:
 	return -1;
 }
 #endif /* CONFIG_INCA_IP_SWITCH_AMDIX */
-
-#endif