diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:09:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:09:55 +0200 |
| commit | 8338984862b6292094e0e8029c306b45ea6b81d4 (patch) | |
| tree | 6f877eab67dde071aefc3db71dcb2cde1744d5b0 /drivers/net/Makefile | |
| parent | d4541ee94f29a1b8b701d7d78d15522599dbb358 (diff) | |
| parent | 77fcad6c44d8885c0b116d9606c01de8062426a8 (diff) | |
| download | barebox-8338984862b6292094e0e8029c306b45ea6b81d4.tar.gz barebox-8338984862b6292094e0e8029c306b45ea6b81d4.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 951a2208b4..4e6b49b191 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_DRIVER_NET_CS8900) += cs8900.o obj-$(CONFIG_DRIVER_NET_SMC911X) += smc911x.o obj-$(CONFIG_DRIVER_NET_SMC91111) += smc91111.o +obj-$(CONFIG_DRIVER_NET_DAVINCI_EMAC) += davinci_emac.o obj-$(CONFIG_DRIVER_NET_DM9K) += dm9k.o obj-$(CONFIG_DRIVER_NET_NETX) += netx_eth.o obj-$(CONFIG_DRIVER_NET_AT91_ETHER) += at91_ether.o @@ -9,7 +10,7 @@ obj-$(CONFIG_DRIVER_NET_FEC_IMX) += fec_imx.o obj-$(CONFIG_DRIVER_NET_EP93XX) += ep93xx.o obj-$(CONFIG_DRIVER_NET_MACB) += macb.o obj-$(CONFIG_DRIVER_NET_TAP) += tap.o -obj-$(CONFIG_MIIDEV) += miidev.o +obj-$(CONFIG_PHYLIB) += phy/ obj-$(CONFIG_NET_USB) += usb/ obj-$(CONFIG_DRIVER_NET_TSE) += altera_tse.o obj-$(CONFIG_DRIVER_NET_KS8851_MLL) += ks8851_mll.o |