Merge branch 'devel' into next

[pandora-kernel.git] / net / Makefile

diff --git a/net/Makefile b/net/Makefile
index 27d1f10..ba44604 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -51,12 +51,14 @@ obj-$(CONFIG_IP_DCCP)               += dccp/
 obj-$(CONFIG_IP_SCTP)          += sctp/
 obj-y                          += wireless/
 obj-$(CONFIG_MAC80211)         += mac80211/
-obj-$(CONFIG_IEEE80211)                += ieee80211/
 obj-$(CONFIG_TIPC)             += tipc/
 obj-$(CONFIG_NETLABEL)         += netlabel/
 obj-$(CONFIG_IUCV)             += iucv/
 obj-$(CONFIG_RFKILL)           += rfkill/
 obj-$(CONFIG_NET_9P)           += 9p/
+ifneq ($(CONFIG_DCB),)
+obj-y                          += dcb/
+endif
 
 ifeq ($(CONFIG_NET),y)
 obj-$(CONFIG_SYSCTL)           += sysctl_net.o