Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / net / mac80211 / Makefile

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index a169b0201d617cab4bfd1363eeb6b94c21b3c8dc..31cfd1f89a72457a4f3c241a8a5500aefbce21bb 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -7,6 +7,8 @@ mac80211-y := \
        sta_info.o \
        wep.o \
        wpa.o \
+       scan.o \
+       ht.o \
        mlme.o \
        iface.o \
        rate.o \
@@ -15,6 +17,7 @@ mac80211-y := \
        aes_ccm.o \
        cfg.o \
        rx.o \
+       spectmgmt.o \
        tx.o \
        key.o \
        util.o \
@@ -38,4 +41,8 @@ mac80211-$(CONFIG_MAC80211_MESH) += \
 rc80211_pid-y := rc80211_pid_algo.o
 rc80211_pid-$(CONFIG_MAC80211_DEBUGFS) += rc80211_pid_debugfs.o
 
+rc80211_minstrel-y := rc80211_minstrel.o
+rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += rc80211_minstrel_debugfs.o
+
 mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc80211_pid-y)
+mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)