From 0c78f4ad19ab84692b560bc74a460bb490d0fd55 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 27 Jul 2009 16:52:07 -0700 Subject: [PATCH] --- yaml --- r: 159343 b: refs/heads/master c: b820b3bcb02a97091b969faf2b5f19f1218953f9 h: refs/heads/master i: 159341: 43d4f79569c89a9dcc68e7e4de15191d60a80ced 159339: b75d2c513ef5bdde1e337e4ff647a4ebab5e28ed 159335: 3dd4d5bae6e5ee3e78ee3ded5f33e7cf8cbd5dc4 159327: da85d4cd5c4a253e4d3bedfc0263b0c71385c8b1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/Kconfig | 18 ++++++++++++++++-- trunk/drivers/net/wireless/ath/ar9170/Kconfig | 1 - trunk/drivers/net/wireless/ath/ath5k/Kconfig | 1 - trunk/drivers/net/wireless/ath/ath9k/Kconfig | 1 - 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fd35982b8d93..80a78851e565 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d17734aee6383ff5e1720b3f01c014c0a9db40d5 +refs/heads/master: b820b3bcb02a97091b969faf2b5f19f1218953f9 diff --git a/trunk/drivers/net/wireless/ath/Kconfig b/trunk/drivers/net/wireless/ath/Kconfig index 6bed009019a5..f27f3a794bbd 100644 --- a/trunk/drivers/net/wireless/ath/Kconfig +++ b/trunk/drivers/net/wireless/ath/Kconfig @@ -2,9 +2,23 @@ config ATH_COMMON tristate "Atheros Wireless Cards" depends on WLAN_80211 depends on CFG80211 - depends on ATH5K || ATH9K || AR9170_USB + ---help--- + This will enable the support for the Atheros wireless drivers. + ath5k, ath9k and ar9170 drivers share some common code, this option + enables the common ath.ko module which currently shares just common + regulatory EEPROM helpers but will likely be extended later to share + more between modules. + For more information and documentation on this module you can visit: + + http://wireless.kernel.org/en/users/Drivers/ath + + For information on all Atheros wireless drivers visit: + + http://wireless.kernel.org/en/users/Drivers/Atheros + +if ATH_COMMON source "drivers/net/wireless/ath/ath5k/Kconfig" source "drivers/net/wireless/ath/ath9k/Kconfig" source "drivers/net/wireless/ath/ar9170/Kconfig" - +endif diff --git a/trunk/drivers/net/wireless/ath/ar9170/Kconfig b/trunk/drivers/net/wireless/ath/ar9170/Kconfig index b99e3263ee6d..de4281fda129 100644 --- a/trunk/drivers/net/wireless/ath/ar9170/Kconfig +++ b/trunk/drivers/net/wireless/ath/ar9170/Kconfig @@ -2,7 +2,6 @@ config AR9170_USB tristate "Atheros AR9170 802.11n USB support" depends on USB && MAC80211 && WLAN_80211 && EXPERIMENTAL select FW_LOADER - select ATH_COMMON help This is a driver for the Atheros "otus" 802.11n USB devices. diff --git a/trunk/drivers/net/wireless/ath/ath5k/Kconfig b/trunk/drivers/net/wireless/ath/ath5k/Kconfig index daf0c83527d8..9b07eef7c610 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/Kconfig +++ b/trunk/drivers/net/wireless/ath/ath5k/Kconfig @@ -1,7 +1,6 @@ config ATH5K tristate "Atheros 5xxx wireless cards support" depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL - select ATH_COMMON select MAC80211_LEDS select LEDS_CLASS select NEW_LEDS diff --git a/trunk/drivers/net/wireless/ath/ath9k/Kconfig b/trunk/drivers/net/wireless/ath/ath9k/Kconfig index 0f4a6d862d3a..2cb72f8c32d7 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/Kconfig +++ b/trunk/drivers/net/wireless/ath/ath9k/Kconfig @@ -1,7 +1,6 @@ config ATH9K tristate "Atheros 802.11n wireless cards support" depends on PCI && MAC80211 && WLAN_80211 - select ATH_COMMON select MAC80211_LEDS select LEDS_CLASS select NEW_LEDS