From f4fb47a7ba838d758ecbe6507d6af2f613f4d6e8 Mon Sep 17 00:00:00 2001
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Date: Wed, 28 Nov 2012 18:57:19 +0200
Subject: [PATCH] --- yaml --- r: 341925 b: refs/heads/master c:
 23c1d7f65975762386760e36c00f149059e537e2 h: refs/heads/master i:   341923:
 13b69c05795d2c3e4f3e65c88a0018444d5f0e7d v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/ath/Kconfig          | 7 +++++--
 trunk/drivers/net/wireless/ath/ar5523/Kconfig   | 1 +
 trunk/drivers/net/wireless/ath/ath5k/Kconfig    | 1 +
 trunk/drivers/net/wireless/ath/ath9k/Kconfig    | 1 +
 trunk/drivers/net/wireless/ath/carl9170/Kconfig | 1 +
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3f9cd699b4d5..c3ebd5889a21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a56c919f05eb73f6d791cc14992f4b451059b68c
+refs/heads/master: 23c1d7f65975762386760e36c00f149059e537e2
diff --git a/trunk/drivers/net/wireless/ath/Kconfig b/trunk/drivers/net/wireless/ath/Kconfig
index c25dcf192fec..1a67a4f829fe 100644
--- a/trunk/drivers/net/wireless/ath/Kconfig
+++ b/trunk/drivers/net/wireless/ath/Kconfig
@@ -1,4 +1,7 @@
-menuconfig ATH_COMMON
+config ATH_COMMON
+	tristate
+
+menuconfig ATH_CARDS
 	tristate "Atheros Wireless Cards"
 	depends on CFG80211 && (!UML || BROKEN)
 	---help---
@@ -14,7 +17,7 @@ menuconfig ATH_COMMON
 
 	  http://wireless.kernel.org/en/users/Drivers/Atheros
 
-if ATH_COMMON
+if ATH_CARDS
 
 config ATH_DEBUG
 	bool "Atheros wireless debugging"
diff --git a/trunk/drivers/net/wireless/ath/ar5523/Kconfig b/trunk/drivers/net/wireless/ath/ar5523/Kconfig
index 11d99ee8de51..0d320cc7769b 100644
--- a/trunk/drivers/net/wireless/ath/ar5523/Kconfig
+++ b/trunk/drivers/net/wireless/ath/ar5523/Kconfig
@@ -1,6 +1,7 @@
 config AR5523
        tristate "Atheros AR5523 wireless driver support"
        depends on MAC80211 && USB
+       select ATH_COMMON
        select FW_LOADER
        ---help---
          This module add support for AR5523 based USB dongles such as D-Link
diff --git a/trunk/drivers/net/wireless/ath/ath5k/Kconfig b/trunk/drivers/net/wireless/ath/ath5k/Kconfig
index 338c5c42357d..c9f81a388f15 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/trunk/drivers/net/wireless/ath/ath5k/Kconfig
@@ -1,6 +1,7 @@
 config ATH5K
 	tristate "Atheros 5xxx wireless cards support"
 	depends on (PCI || ATHEROS_AR231X) && MAC80211
+	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 c7aa6646123e..5fc15bf8be09 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/trunk/drivers/net/wireless/ath/ath9k/Kconfig
@@ -17,6 +17,7 @@ config ATH9K_BTCOEX_SUPPORT
 config ATH9K
 	tristate "Atheros 802.11n wireless cards support"
 	depends on MAC80211
+	select ATH_COMMON
 	select ATH9K_HW
 	select MAC80211_LEDS
 	select LEDS_CLASS
diff --git a/trunk/drivers/net/wireless/ath/carl9170/Kconfig b/trunk/drivers/net/wireless/ath/carl9170/Kconfig
index 267d5dcf82dc..13a204598766 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/Kconfig
+++ b/trunk/drivers/net/wireless/ath/carl9170/Kconfig
@@ -1,6 +1,7 @@
 config CARL9170
 	tristate "Linux Community AR9170 802.11n USB support"
 	depends on USB && MAC80211 && EXPERIMENTAL
+	select ATH_COMMON
 	select FW_LOADER
 	select CRC32
 	help