diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
| commit | 740f41d3cbefe2068247852220226c2c3b287249 (patch) | |
| tree | a8afb3f0e3f0b7d4574cbbfd2e8d780db6b4ae08 /drivers/net/Makefile | |
| parent | f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 (diff) | |
| parent | 7c48b015100eeff0e1bbb766394f7beca23afb48 (diff) | |
| download | u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.zip u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.tar.gz u-boot-imx-740f41d3cbefe2068247852220226c2c3b287249.tar.bz2 | |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 6226cb2..7cc6b6f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_DNET) += dnet.o obj-$(CONFIG_E1000) += e1000.o obj-$(CONFIG_E1000_SPI) += e1000_spi.o obj-$(CONFIG_EEPRO100) += eepro100.o +obj-$(CONFIG_SUNXI_EMAC) += sunxi_emac.o obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_EP93XX) += ep93xx_eth.o obj-$(CONFIG_ETHOC) += ethoc.o @@ -51,7 +52,6 @@ obj-$(CONFIG_RTL8169) += rtl8169.o obj-$(CONFIG_SH_ETHER) += sh_eth.o obj-$(CONFIG_SMC91111) += smc91111.o obj-$(CONFIG_SMC911X) += smc911x.o -obj-$(CONFIG_SUNXI_WEMAC) += sunxi_wemac.o obj-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o obj-$(CONFIG_TSEC_ENET) += tsec.o fsl_mdio.o obj-$(CONFIG_DRIVER_TI_CPSW) += cpsw.o |