diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 12:41:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 12:41:58 -0800 |
| commit | 1725d409caba16ea5fc694bd50e95e79e8ced11a (patch) | |
| tree | 688fe26dd4ceda5364692f0ce307aadb6f04f331 /net/mac80211/Makefile | |
| parent | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (diff) | |
| parent | b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/Makefile')
| -rw-r--r-- | net/mac80211/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile index 7d4971aa443..58c94bb38e8 100644 --- a/net/mac80211/Makefile +++ b/net/mac80211/Makefile @@ -15,6 +15,7 @@ mac80211-y := \ michael.o \ tkip.o \ aes_ccm.o \ + aes_cmac.o \ cfg.o \ rx.o \ spectmgmt.o \ @@ -37,6 +38,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 |