Merge branch 'linus' into x86/urgent

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

diff --git a/net/802/Makefile b/net/802/Makefile
index 68569ff..7893d67 100644 (file)
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -10,3 +10,5 @@ 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