Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[sfrench/cifs-2.6.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index f5141b9d4f38ff94e7a696438bbaa2e9de9f3214..ad4d14f4bb29637729552524decedc574bc1ccad 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -45,6 +45,8 @@ obj-$(CONFIG_VLAN_8021Q)      += 8021q/
 obj-$(CONFIG_IP_DCCP)          += dccp/
 obj-$(CONFIG_IP_SCTP)          += sctp/
 obj-$(CONFIG_IEEE80211)                += ieee80211/
+obj-$(CONFIG_TIPC)             += tipc/
+obj-$(CONFIG_NETLABEL)         += netlabel/
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o