diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-10-28 16:29:30 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-10-30 16:50:35 -0400 |
| commit | 133d7c6a504c672011ebc24b26e05b15f7410c07 (patch) | |
| tree | d4ffe834b2ad75ccceb1afe4d4e1338d4c0fe9c2 /drivers/net/wireless/ath | |
| parent | 4b5783549730da21d88b41dce9a2b738afa44abc (diff) | |
wireless: remove WLAN_80211 and WLAN_PRE80211 from Kconfig
With the WLAN_PRE80211 drivers moved to drivers/staging, this
distinction becomes unnecessary.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
| -rw-r--r-- | drivers/net/wireless/ath/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ar9170/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/Kconfig | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig index 6ce86cb37654..4e7a7fd695c8 100644 --- a/drivers/net/wireless/ath/Kconfig +++ b/drivers/net/wireless/ath/Kconfig | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | menuconfig ATH_COMMON | 1 | menuconfig ATH_COMMON |
| 2 | tristate "Atheros Wireless Cards" | 2 | tristate "Atheros Wireless Cards" |
| 3 | depends on WLAN_80211 | ||
| 4 | depends on CFG80211 | 3 | depends on CFG80211 |
| 5 | ---help--- | 4 | ---help--- |
| 6 | This will enable the support for the Atheros wireless drivers. | 5 | This will enable the support for the Atheros wireless drivers. |
diff --git a/drivers/net/wireless/ath/ar9170/Kconfig b/drivers/net/wireless/ath/ar9170/Kconfig index 05918f1e685a..d7a4799d20fb 100644 --- a/drivers/net/wireless/ath/ar9170/Kconfig +++ b/drivers/net/wireless/ath/ar9170/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config AR9170_USB | 1 | config AR9170_USB |
| 2 | tristate "Atheros AR9170 802.11n USB support" | 2 | tristate "Atheros AR9170 802.11n USB support" |
| 3 | depends on USB && MAC80211 && WLAN_80211 | 3 | depends on USB && MAC80211 |
| 4 | select FW_LOADER | 4 | select FW_LOADER |
| 5 | help | 5 | help |
| 6 | This is a driver for the Atheros "otus" 802.11n USB devices. | 6 | This is a driver for the Atheros "otus" 802.11n USB devices. |
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig index 06d006675d7d..eb83b7b4d0e3 100644 --- a/drivers/net/wireless/ath/ath5k/Kconfig +++ b/drivers/net/wireless/ath/ath5k/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config ATH5K | 1 | config ATH5K |
| 2 | tristate "Atheros 5xxx wireless cards support" | 2 | tristate "Atheros 5xxx wireless cards support" |
| 3 | depends on PCI && MAC80211 && WLAN_80211 | 3 | depends on PCI && MAC80211 |
| 4 | select MAC80211_LEDS | 4 | select MAC80211_LEDS |
| 5 | select LEDS_CLASS | 5 | select LEDS_CLASS |
| 6 | select NEW_LEDS | 6 | select NEW_LEDS |
diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig index 99ce066392a7..b735fb399fb1 100644 --- a/drivers/net/wireless/ath/ath9k/Kconfig +++ b/drivers/net/wireless/ath/ath9k/Kconfig | |||
| @@ -3,7 +3,7 @@ config ATH9K_HW | |||
| 3 | 3 | ||
| 4 | config ATH9K | 4 | config ATH9K |
| 5 | tristate "Atheros 802.11n wireless cards support" | 5 | tristate "Atheros 802.11n wireless cards support" |
| 6 | depends on PCI && MAC80211 && WLAN_80211 | 6 | depends on PCI && MAC80211 |
| 7 | select ATH9K_HW | 7 | select ATH9K_HW |
| 8 | select MAC80211_LEDS | 8 | select MAC80211_LEDS |
| 9 | select LEDS_CLASS | 9 | select LEDS_CLASS |