Commit b5c9b4f9 authored by Kalle Valo's avatar Kalle Valo

ath: unify Kconfig with other vendors

Change menuconfig to config to keep the Kconfig entries unified. Part of
reorganising wireless drivers directory and Kconfig.
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent bd842171
...@@ -18,6 +18,7 @@ menuconfig WLAN ...@@ -18,6 +18,7 @@ menuconfig WLAN
if WLAN if WLAN
source "drivers/net/wireless/admtek/Kconfig" source "drivers/net/wireless/admtek/Kconfig"
source "drivers/net/wireless/ath/Kconfig"
source "drivers/net/wireless/atmel/Kconfig" source "drivers/net/wireless/atmel/Kconfig"
source "drivers/net/wireless/broadcom/Kconfig" source "drivers/net/wireless/broadcom/Kconfig"
source "drivers/net/wireless/cisco/Kconfig" source "drivers/net/wireless/cisco/Kconfig"
...@@ -99,6 +100,4 @@ config MAC80211_HWSIM ...@@ -99,6 +100,4 @@ config MAC80211_HWSIM
To compile this driver as a module, choose M here: the module will be To compile this driver as a module, choose M here: the module will be
called mac80211_hwsim. If unsure, say N. called mac80211_hwsim. If unsure, say N.
source "drivers/net/wireless/ath/Kconfig"
endif # WLAN endif # WLAN
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# #
obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/ obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
obj-$(CONFIG_WLAN_VENDOR_ATH) += ath/
obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/ obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/ obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/ obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
...@@ -23,6 +24,4 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o ...@@ -23,6 +24,4 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o
obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o
obj-$(CONFIG_ATH_CARDS) += ath/
obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o
config ATH_COMMON config ATH_COMMON
tristate tristate
menuconfig ATH_CARDS config WLAN_VENDOR_ATH
tristate "Atheros Wireless Cards" bool "Atheros/Qualcomm devices"
depends on CFG80211 && (!UML || BROKEN) default y
---help--- ---help---
This will enable the support for the Atheros wireless drivers. If you have a wireless card belonging to this class, say Y.
ath5k, ath9k, ath9k_htc and ar9170 drivers share some common code, this option
enables the common ath.ko module which shares common helpers. Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about cards. If you say Y, you will be asked for
your specific card in the following questions.
For more information and documentation on this module you can visit: For more information and documentation on this module you can visit:
...@@ -17,7 +20,7 @@ menuconfig ATH_CARDS ...@@ -17,7 +20,7 @@ menuconfig ATH_CARDS
http://wireless.kernel.org/en/users/Drivers/Atheros http://wireless.kernel.org/en/users/Drivers/Atheros
if ATH_CARDS if WLAN_VENDOR_ATH
config ATH_DEBUG config ATH_DEBUG
bool "Atheros wireless debugging" bool "Atheros wireless debugging"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment