diff options
author | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-29 18:08:02 -0400 |
---|---|---|
committer | Gerald Van Baren <vanbaren@cideas.com> | 2008-03-29 18:08:02 -0400 |
commit | 3596d55eb22703d3f4f1b839fe4b000fabe081b3 (patch) | |
tree | 96d1ce693dc72c2fbc63da37928afd4761e82fd2 /drivers/net/Makefile | |
parent | 493a2b1dc97367e904bf83869501f6290f3b374e (diff) | |
parent | 74d1e66d22dac91388bc538b2fe19f735edc5b82 (diff) | |
download | u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.zip u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.tar.gz u-boot-imx-3596d55eb22703d3f4f1b839fe4b000fabe081b3.tar.bz2 |
Merge git://www.denx.de/git/u-boot into uboot
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r-- | drivers/net/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b9723fa..320dc3e 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -27,6 +27,7 @@ LIB := $(obj)libnet.a COBJS-y += 3c589.o COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o +COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o COBJS-y += cs8900.o COBJS-y += dc2114x.o COBJS-y += dm9000x.o @@ -40,7 +41,7 @@ COBJS-y += lan91c96.o COBJS-y += macb.o COBJS-y += mcffec.o COBJS-y += natsemi.o -COBJS-y += ne2000.o +COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o COBJS-y += netarm_eth.o COBJS-y += netconsole.o COBJS-y += ns7520_eth.o @@ -57,6 +58,7 @@ COBJS-y += tigon3.o COBJS-y += tsec.o COBJS-y += tsi108_eth.o COBJS-y += uli526x.o +COBJS-y += vsc7385.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) |