Merge branch 'master' of ../net-2.6/

[linux-2.6] / net / mac80211 / Makefile

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 9d7a19581a295a8c0d8a495ced04f9ee449dfad8..70f4b26c2d872d6859a87ce0f044d571259612ee 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -36,11 +36,15 @@ 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
 CFLAGS_rc80211_pid_algo.o += -DRC80211_PID_COMPILE
-mac80211-$(CONFIG_MAC80211_RC_SIMPLE) += rc80211_simple.o
 mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc-pid-$(CONFIG_MAC80211_RC_PID))
 
 # Modular rate algorithms are assigned to mac80211-m - make separate modules