Staging: wireless drivers Kconfig change

Change the wireless drivers to depend on CONFIG_WLAN instead of
CONFIG_WLAN_80211 which is going away soon.


Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

6 files changed, 6 insertions, 6 deletions

diff --git a/drivers/staging/otus/Kconfig b/drivers/staging/otus/Kconfig
index d549d08fd495..f6cc2625e341 100644
--- a/drivers/staging/otus/Kconfig
+++ b/drivers/staging/otus/Kconfig
@@ -1,6 +1,6 @@
 config OTUS
         tristate "Atheros OTUS 802.11n USB wireless support"
-        depends on USB && WLAN_80211 && MAC80211
+        depends on USB && WLAN && MAC80211
         default N
         ---help---
           Enable support for Atheros 802.11n USB hardware:
diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
index 7f44e5e72463..efe38e25c5ed 100644
--- a/drivers/staging/rt2860/Kconfig
+++ b/drivers/staging/rt2860/Kconfig
@@ -1,5 +1,5 @@
 config RT2860
         tristate "Ralink 2860 wireless support"
-        depends on PCI && X86 && WLAN_80211
+        depends on PCI && X86 && WLAN
         ---help---
           This is an experimental driver for the Ralink 2860 wireless chip.
diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
index 76841f6dea93..aea5c8221810 100644
--- a/drivers/staging/rt2870/Kconfig
+++ b/drivers/staging/rt2870/Kconfig
@@ -1,5 +1,5 @@
 config RT2870
         tristate "Ralink 2870/3070 wireless support"
-        depends on USB && X86 && WLAN_80211
+        depends on USB && X86 && WLAN
         ---help---
           This is an experimental driver for the Ralink xx70 wireless chips.
diff --git a/drivers/staging/rt3090/Kconfig b/drivers/staging/rt3090/Kconfig
index 255e8eaa4836..2b3f745d72b7 100644
--- a/drivers/staging/rt3090/Kconfig
+++ b/drivers/staging/rt3090/Kconfig
@@ -1,5 +1,5 @@
 config RT3090
         tristate "Ralink 3090 wireless support"
-        depends on PCI && X86 && WLAN_80211
+        depends on PCI && X86 && WLAN
         ---help---
           This is an experimental driver for the Ralink 3090 wireless chip.
diff --git a/drivers/staging/winbond/Kconfig b/drivers/staging/winbond/Kconfig
index 940460c39f36..132671d96d0d 100644
--- a/drivers/staging/winbond/Kconfig
+++ b/drivers/staging/winbond/Kconfig
@@ -1,6 +1,6 @@
 config W35UND
         tristate "IS89C35 WLAN USB driver"
-        depends on MAC80211 && WLAN_80211 && USB && EXPERIMENTAL
+        depends on MAC80211 && WLAN && USB && EXPERIMENTAL
         default n
         ---help---
           This is highly experimental driver for Winbond WIFI card.
diff --git a/drivers/staging/wlan-ng/Kconfig b/drivers/staging/wlan-ng/Kconfig
index 9959b658c8cf..f44294b0d8dc 100644
--- a/drivers/staging/wlan-ng/Kconfig
+++ b/drivers/staging/wlan-ng/Kconfig
@@ -1,6 +1,6 @@
 config PRISM2_USB
         tristate "Prism2.5/3 USB driver"
-        depends on WLAN_80211 && USB && WIRELESS_EXT
+        depends on WLAN && USB && WIRELESS_EXT
         default n
         ---help---
           This is the wlan-ng prism 2.5/3 USB driver for a wide range of