Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / drivers / net / wireless / Kconfig

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 28aa05f..f8f0156 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -138,7 +138,7 @@ config AIRO_CS
 
 config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
-       depends on EXPERIMENTAL && PCMCIA
+       depends on PCMCIA
        select WIRELESS_EXT
        select WEXT_SPY
        help
@@ -148,7 +148,7 @@ config PCMCIA_WL3501
 
 config PRISM54
        tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
-       depends on PCI && EXPERIMENTAL
+       depends on PCI
        select WIRELESS_EXT
        select WEXT_SPY
        select WEXT_PRIV
@@ -187,7 +187,7 @@ config USB_ZD1201
 
 config USB_NET_RNDIS_WLAN
        tristate "Wireless RNDIS USB support"
-       depends on USB && EXPERIMENTAL
+       depends on USB
        depends on CFG80211
        select USB_USBNET
        select USB_NET_CDCETHER
@@ -217,7 +217,7 @@ source "drivers/net/wireless/rtl818x/Kconfig"
 
 config ADM8211
        tristate "ADMtek ADM8211 support"
-       depends on MAC80211 && PCI && EXPERIMENTAL
+       depends on MAC80211 && PCI
        select CRC32
        select EEPROM_93CX6
        ---help---
@@ -257,7 +257,7 @@ config MAC80211_HWSIM
 
 config MWL8K
        tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
-       depends on MAC80211 && PCI && EXPERIMENTAL
+       depends on MAC80211 && PCI
        ---help---
          This driver supports Marvell TOPDOG 802.11 wireless cards.