diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/net/Makefile | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 c91e95126f7..8427bf9dec9 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 | # |