net: Conditional COBJS inclusion of TSEC and Vitesse modules
From: Shinya Kuribayashi skuribay@ruby.dti.ne.jp
Signed-off-by: Shinya Kuribayashi skuribay@ruby.dti.ne.jp ---
drivers/net/Makefile | 4 ++-- drivers/net/tsec.c | 3 --- drivers/net/vsc7385.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 70a6dde..3370aa4 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -60,10 +60,10 @@ COBJS-y += s3c4510b_eth.o COBJS-y += smc91111.o COBJS-y += smc911x.o COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o -COBJS-y += tsec.o +COBJS-$(CONFIG_TSEC_ENET) += tsec.o COBJS-y += tsi108_eth.o COBJS-y += uli526x.o -COBJS-y += vsc7385.o +COBJS-$(CONFIG_VSC7385_ENET) += vsc7385.o COBJS-$(CONFIG_XILINX_EMAC) += xilinx_emac.o COBJS-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index c7af930..9d20918 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -17,7 +17,6 @@ #include <net.h> #include <command.h>
-#if defined(CONFIG_TSEC_ENET) #include "tsec.h" #include "miiphy.h"
@@ -1710,5 +1709,3 @@ tsec_mcast_addr (struct eth_device *dev, u8 mcast_mac, u8 set) return 0; } #endif /* Multicast TFTP ? */ - -#endif /* CONFIG_TSEC_ENET */ diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c index 4095bce..4e7259f 100644 --- a/drivers/net/vsc7385.c +++ b/drivers/net/vsc7385.c @@ -13,9 +13,6 @@ */
#include <config.h> - -#ifdef CONFIG_VSC7385_ENET - #include <common.h> #include <asm/io.h> #include <asm/errno.h> @@ -97,5 +94,3 @@ int vsc7385_upload_firmware(void *firmware, unsigned int size)
return 0; } - -#endif