diff options
| author | Andy Fleming | 2009-02-05 01:42:12 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-02-05 01:42:35 +0100 |
| commit | 1577ecef766650a57fceb171acee2b13cbfaf1d3 (patch) | |
| tree | b66df11d8815f95f815e65c3c3ffd32df81b8d43 /drivers/net/Makefile | |
| parent | virtio_net: Allow setting the MAC address of the NIC (diff) | |
| download | kernel-qcow2-linux-1577ecef766650a57fceb171acee2b13cbfaf1d3.tar.gz kernel-qcow2-linux-1577ecef766650a57fceb171acee2b13cbfaf1d3.tar.xz kernel-qcow2-linux-1577ecef766650a57fceb171acee2b13cbfaf1d3.zip | |
netdev: Merge UCC and gianfar MDIO bus drivers
The MDIO bus drivers for the UCC and gianfar ethernet controllers are
essentially the same. There's no reason to duplicate that much code.
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a3c5c002f224..ad87ba72cf1f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -24,11 +24,12 @@ obj-$(CONFIG_JME) += jme.o gianfar_driver-objs := gianfar.o \ gianfar_ethtool.o \ - gianfar_mii.o \ gianfar_sysfs.o obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o -ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o ucc_geth_ethtool.o +ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o + +obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o # # link order important here |