diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-31 09:06:29 +0200 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-27 09:58:13 +0200 |
| commit | 33f810b2036f13f1b123062a9e5c1794d400ce81 (patch) | |
| tree | 370b55026f4bd856e96842f86af631ca2bab3da2 /drivers/net/Makefile | |
| parent | Merge branch 'davem-next.mii' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-33f810b2036f13f1b123062a9e5c1794d400ce81.tar.xz linux-33f810b2036f13f1b123062a9e5c1794d400ce81.zip | |
fddi: Move the FDDI drivers
Move the FDDI drivers into drivers/net/fddi/ and make the
necessary Kconfig and Makefile changes.
CC: "Maciej W. Rozycki" <macro@linux-mips.org>
CC: Christoph Goos <cgoos@syskonnect.de>
CC: <linux@syskonnect.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index c33009b49608..3087b27c7841 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ # obj-$(CONFIG_PLIP) += plip.o obj-$(CONFIG_ROADRUNNER) += rrunner.o -obj-$(CONFIG_SKFP) += skfp/ obj-$(CONFIG_RIONET) += rionet.o # @@ -42,13 +41,13 @@ obj-$(CONFIG_DUMMY) += dummy.o obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_MACVTAP) += macvtap.o -obj-$(CONFIG_DEFXX) += defxx.o obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ +obj-$(CONFIG_FDDI) += fddi/ obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_ARCNET) += arcnet/ |