Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[linux-2.6] / net / 802 / Makefile

diff --git a/net/802/Makefile b/net/802/Makefile
index 01861929591a88f41ab4d356924310f73f75d433..7893d679910cdc1e98fc78f6995839a7e188c1d0 100644 (file)
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -2,14 +2,13 @@
 # Makefile for the Linux 802.x protocol layers.
 #
 
-obj-y                  := p8023.o
-
 # Check the p8022 selections against net/core/Makefile.
-obj-$(CONFIG_SYSCTL)   += sysctl_net_802.o
 obj-$(CONFIG_LLC)      += p8022.o psnap.o
-obj-$(CONFIG_TR)       += p8022.o psnap.o tr.o sysctl_net_802.o
+obj-$(CONFIG_TR)       += p8022.o psnap.o tr.o
 obj-$(CONFIG_NET_FC)   +=                 fc.o
 obj-$(CONFIG_FDDI)     +=                 fddi.o
 obj-$(CONFIG_HIPPI)    +=                 hippi.o
-obj-$(CONFIG_IPX)      += p8022.o psnap.o
+obj-$(CONFIG_IPX)      += p8022.o psnap.o p8023.o
 obj-$(CONFIG_ATALK)    += p8022.o psnap.o
+obj-$(CONFIG_STP)      += stp.o
+obj-$(CONFIG_GARP)     += garp.o