Merge branch 'from-linus' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / Makefile

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c91e95126f78052eace67653aceef84c5fd50626..8427bf9dec9d9b9aa558a44dbf85fb75c09acda7 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -18,6 +18,9 @@ gianfar_driver-objs := gianfar.o \
                gianfar_mii.o \
                gianfar_sysfs.o
 
+obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
+ucc_geth_driver-objs := ucc_geth.o ucc_geth_phy.o
+
 #
 # link order important here
 #