Merge mainline (v2.6.34-rc7)

[pandora-kernel.git] / net / 802 / Makefile

diff --git a/net/802/Makefile b/net/802/Makefile
index 977704a..7893d67 100644 (file)
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -3,11 +3,12 @@
 #
 
 # 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 p8023.o
 obj-$(CONFIG_ATALK)    += p8022.o psnap.o
+obj-$(CONFIG_STP)      += stp.o
+obj-$(CONFIG_GARP)     += garp.o