diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-07-29 14:40:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-29 14:40:16 -0400 |
| commit | 0ba568d7be1e6b355aa80adcf2c93de41e5c2afc (patch) | |
| tree | f59deb2a1532ec1b83c6bd09bba218766f6f519c | |
| parent | e2288b66fe7ff0288382b2af671b4da558b44472 (diff) | |
| parent | 58cfb681bffb43654776a218a087028ff425ba9e (diff) | |
| download | op-kernel-dev-0ba568d7be1e6b355aa80adcf2c93de41e5c2afc.zip op-kernel-dev-0ba568d7be1e6b355aa80adcf2c93de41e5c2afc.tar.gz | |
Merge branch 'for-linville-current' of git://github.com/kvalo/ath
| -rw-r--r-- | MAINTAINERS | 10 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/Kconfig | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bf61e04..7a403ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1406,7 +1406,7 @@ ATHEROS ATH6KL WIRELESS DRIVER M: Kalle Valo <kvalo@qca.qualcomm.com> L: linux-wireless@vger.kernel.org W: http://wireless.kernel.org/en/users/Drivers/ath6kl -T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git +T: git git://github.com/kvalo/ath.git S: Supported F: drivers/net/wireless/ath/ath6kl/ @@ -6719,6 +6719,14 @@ T: git git://linuxtv.org/anttip/media_tree.git S: Maintained F: drivers/media/tuners/qt1010* +QUALCOMM ATHEROS ATH10K WIRELESS DRIVER +M: Kalle Valo <kvalo@qca.qualcomm.com> +L: ath10k@lists.infradead.org +W: http://wireless.kernel.org/en/users/Drivers/ath10k +T: git git://github.com/kvalo/ath.git +S: Supported +F: drivers/net/wireless/ath/ath10k/ + QUALCOMM HEXAGON ARCHITECTURE M: Richard Kuo <rkuo@codeaurora.org> L: linux-hexagon@vger.kernel.org diff --git a/drivers/net/wireless/ath/ath10k/Kconfig b/drivers/net/wireless/ath/ath10k/Kconfig index cde58fe..82e8088 100644 --- a/drivers/net/wireless/ath/ath10k/Kconfig +++ b/drivers/net/wireless/ath/ath10k/Kconfig @@ -1,6 +1,6 @@ config ATH10K tristate "Atheros 802.11ac wireless cards support" - depends on MAC80211 + depends on MAC80211 && HAS_DMA select ATH_COMMON ---help--- This module adds support for wireless adapters based on |
