diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:45:11 -0400 |
commit | 846050dd49719b1f68248807bba5c27bfc86f81a (patch) | |
tree | 79922936e8cde867ba90d753f79aa61f575e162b /drivers/net/Makefile | |
parent | 49666145de54b5d6d256442bb1bec03ffae1ac76 (diff) | |
parent | 2ca2d5e84c19ddbc0126087af6288533a05f1799 (diff) | |
download | linux-3.10-846050dd49719b1f68248807bba5c27bfc86f81a.tar.gz linux-3.10-846050dd49719b1f68248807bba5c27bfc86f81a.tar.bz2 linux-3.10-846050dd49719b1f68248807bba5c27bfc86f81a.zip |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r-- | drivers/net/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5e91c3562ad..6ff17649c0f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -14,6 +14,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 # |