Merge branches 'upstream' and 'ntrig-multitouch' into for-linus

[karo-tx-linux.git] / net / mac80211 / Makefile

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 7d4971aa443f177a692bd909a9dbef8c50e682d5..0e3ab88bb7063adac42e90c69d5985c86656ff1a 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -8,13 +8,15 @@ mac80211-y := \
        wep.o \
        wpa.o \
        scan.o \
-       ht.o \
+       ht.o agg-tx.o agg-rx.o \
+       ibss.o \
        mlme.o \
        iface.o \
        rate.o \
        michael.o \
        tkip.o \
        aes_ccm.o \
+       aes_cmac.o \
        cfg.o \
        rx.o \
        spectmgmt.o \
@@ -37,6 +39,8 @@ mac80211-$(CONFIG_MAC80211_MESH) += \
        mesh_plink.o \
        mesh_hwmp.o
 
+mac80211-$(CONFIG_PM) += pm.o
+
 # objects for PID algorithm
 rc80211_pid-y := rc80211_pid_algo.o
 rc80211_pid-$(CONFIG_MAC80211_DEBUGFS) += rc80211_pid_debugfs.o