diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /drivers/net/wireless/ath/ath6kl/Makefile | |
parent | ip6mr: Add sizeof verification to MRT6_ASSERT and MT6_PIM (diff) | |
parent | bcma: add more package IDs (diff) | |
download | linux-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.xz linux-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/Makefile')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/Makefile b/drivers/net/wireless/ath/ath6kl/Makefile index 8cae8886f17d..cab0ec0d5380 100644 --- a/drivers/net/wireless/ath/ath6kl/Makefile +++ b/drivers/net/wireless/ath/ath6kl/Makefile @@ -34,6 +34,7 @@ ath6kl_core-y += main.o ath6kl_core-y += txrx.o ath6kl_core-y += wmi.o ath6kl_core-y += core.o +ath6kl_core-y += recovery.o ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o obj-$(CONFIG_ATH6KL_SDIO) += ath6kl_sdio.o |