aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2009-02-04 16:42:12 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-04 16:42:35 -0800
commit1577ecef766650a57fceb171acee2b13cbfaf1d3 (patch)
treeb66df11d8815f95f815e65c3c3ffd32df81b8d43 /drivers/net/Makefile
parent9c46f6d42f1b5627c49a5906cb5b315ad8716ff0 (diff)
downloadkernel_samsung_aries-1577ecef766650a57fceb171acee2b13cbfaf1d3.zip
kernel_samsung_aries-1577ecef766650a57fceb171acee2b13cbfaf1d3.tar.gz
kernel_samsung_aries-1577ecef766650a57fceb171acee2b13cbfaf1d3.tar.bz2
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/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a3c5c00..ad87ba7 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