diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /drivers/net/Makefile | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
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 c91e95126f78..8427bf9dec9d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -18,6 +18,9 @@ gianfar_driver-objs := gianfar.o \ | |||
| 18 | gianfar_mii.o \ | 18 | gianfar_mii.o \ |
| 19 | gianfar_sysfs.o | 19 | gianfar_sysfs.o |
| 20 | 20 | ||
| 21 | obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o | ||
| 22 | ucc_geth_driver-objs := ucc_geth.o ucc_geth_phy.o | ||
| 23 | |||
| 21 | # | 24 | # |
| 22 | # link order important here | 25 | # link order important here |
| 23 | # | 26 | # |