the scheduled ieee80211 softmac removal

[linux-2.6] / net / mac80211 / Makefile

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 54f46bc80cfed4574f22d4dfa4e6cefbfaadf1b4..829ce4256b76135a48621b6021f4c620aab55a48 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -19,7 +19,6 @@ mac80211-y := \
        ieee80211_iface.o \
        ieee80211_rate.o \
        michael.o \
-       regdomain.o \
        tkip.o \
        aes_ccm.o \
        cfg.o \
@@ -37,6 +36,12 @@ mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
        debugfs_netdev.o \
        debugfs_key.o
 
+mac80211-$(CONFIG_MAC80211_MESH) += \
+       mesh.o \
+       mesh_pathtbl.o \
+       mesh_plink.o \
+       mesh_hwmp.o
+
 
 # Build rate control algorithm(s)
 CFLAGS_rc80211_simple.o += -DRC80211_SIMPLE_COMPILE