1 files changed, 12 insertions, 9 deletions

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 54f46bc80cfe..4e5847fd316c 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -10,16 +10,15 @@ rc-pid-m := rc80211_pid.o
 
 # mac80211 objects
 mac80211-y := \
-        ieee80211.o \
-        ieee80211_ioctl.o \
+        main.o \
+        wext.o \
         sta_info.o \
         wep.o \
         wpa.o \
-        ieee80211_sta.o \
-        ieee80211_iface.o \
-        ieee80211_rate.o \
+        mlme.o \
+        iface.o \
+        rate.o \
         michael.o \
-        regdomain.o \
         tkip.o \
         aes_ccm.o \
         cfg.o \
@@ -29,7 +28,7 @@ mac80211-y := \
         util.o \
         event.o
 
-mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
+mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_NET_SCHED) += wme.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
         debugfs.o \
@@ -37,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