From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shinya Kuribayashi Date: Sun, 08 Jun 2008 01:07:42 +0900 Subject: [U-Boot-Users] [PATCH 4/10] net: Conditional COBJS inclusion of INCA-IP switch In-Reply-To: <484AB1AA.4060609@ruby.dti.ne.jp> References: <484AB0C3.4050906@ruby.dti.ne.jp> <484AB14D.3000404@ruby.dti.ne.jp> <484AB1AA.4060609@ruby.dti.ne.jp> Message-ID: <484AB24E.7050509@ruby.dti.ne.jp> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de net: Conditional COBJS inclusion of INCA-IP switch From: Shinya Kuribayashi Signed-off-by: Shinya Kuribayashi --- 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 -#if defined(CONFIG_CMD_NET) \ - && defined(CONFIG_NET_MULTI) && defined(CONFIG_INCA_IP_SWITCH) - #include #include #include @@ -813,5 +810,3 @@ Fail: return -1; } #endif /* CONFIG_INCA_IP_SWITCH_AMDIX */ - -#endif