diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 00:58:48 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 00:58:48 -0400 |
| commit | 20253de9d566f02b82aa1e0c103f73e80619106a (patch) | |
| tree | a91db957a3dd40469531f35a920b8302c03fb7ee /drivers/net/fs_enet/Makefile | |
| parent | b7277155f8fa89cd5696140b4a93cfb53d0091ff (diff) | |
| parent | 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 (diff) | |
Merge branch 'upstream-greg' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/fs_enet/Makefile')
| -rw-r--r-- | drivers/net/fs_enet/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fs_enet/Makefile b/drivers/net/fs_enet/Makefile index d6dd3f2fb43e..02d4dc18ba69 100644 --- a/drivers/net/fs_enet/Makefile +++ b/drivers/net/fs_enet/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | obj-$(CONFIG_FS_ENET) += fs_enet.o | 5 | obj-$(CONFIG_FS_ENET) += fs_enet.o |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_8xx) += mac-fec.o mac-scc.o | 7 | obj-$(CONFIG_8xx) += mac-fec.o mac-scc.o mii-fec.o |
| 8 | obj-$(CONFIG_8260) += mac-fcc.o | 8 | obj-$(CONFIG_CPM2) += mac-fcc.o mii-bitbang.o |
| 9 | 9 | ||
| 10 | fs_enet-objs := fs_enet-main.o fs_enet-mii.o mii-bitbang.o mii-fixed.o | 10 | fs_enet-objs := fs_enet-main.o |