Commit 0ba568d7 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-linville-current' of git://github.com/kvalo/ath

parents e2288b66 58cfb681

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/ath/ath10k/Kconfig

+1 −1
Original line number Diff line number Diff line 
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