iwlwifi: unify SW rf-kill flow

[safe/jmp/linux-2.6] / drivers / net / wireless / Kconfig

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index f4ca6fd..fdf5aa8 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -271,7 +271,6 @@ config LIBERTAS
        tristate "Marvell 8xxx Libertas WLAN driver support"
        depends on WLAN_80211
        select WIRELESS_EXT
-       select IEEE80211
        select FW_LOADER
        ---help---
          A library for Marvell Libertas 8xxx devices.
@@ -284,7 +283,7 @@ config LIBERTAS_USB
 
 config LIBERTAS_CS
        tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
-       depends on LIBERTAS && PCMCIA && EXPERIMENTAL
+       depends on LIBERTAS && PCMCIA
        select FW_LOADER
        ---help---
          A driver for Marvell Libertas 8385 CompactFlash devices.
@@ -674,70 +673,7 @@ config ADM8211
 
          Thanks to Infineon-ADMtek for their support of this driver.
 
-config P54_COMMON
-       tristate "Softmac Prism54 support"
-       depends on MAC80211 && WLAN_80211 && FW_LOADER && EXPERIMENTAL
-       ---help---
-         This is common code for isl38xx based cards.
-         This module does nothing by itself - the USB/PCI frontends
-         also need to be enabled in order to support any devices.
-
-         These devices require softmac firmware which can be found at
-         http://prism54.org/
-
-         If you choose to build a module, it'll be called p54common.
-
-config P54_USB
-       tristate "Prism54 USB support"
-       depends on P54_COMMON && USB
-       select CRC32
-       ---help---
-         This driver is for USB isl38xx based wireless cards.
-         These are USB based adapters found in devices such as:
-
-         3COM 3CRWE254G72
-         SMC 2862W-G
-         Accton 802.11g WN4501 USB
-         Siemens Gigaset USB
-         Netgear WG121
-         Netgear WG111
-         Medion 40900, Roper Europe
-         Shuttle PN15, Airvast WM168g, IOGear GWU513
-         Linksys WUSB54G
-         Linksys WUSB54G Portable
-         DLink DWL-G120 Spinnaker
-         DLink DWL-G122
-         Belkin F5D7050 ver 1000
-         Cohiba Proto board
-         SMC 2862W-G version 2
-         U.S. Robotics U5 802.11g Adapter
-         FUJITSU E-5400 USB D1700
-         Sagem XG703A
-         DLink DWL-G120 Cohiba
-         Spinnaker Proto board
-         Linksys WUSB54AG
-         Inventel UR054G
-         Spinnaker DUT
-
-         These devices require softmac firmware which can be found at
-         http://prism54.org/
-
-         If you choose to build a module, it'll be called p54usb.
-
-config P54_PCI
-       tristate "Prism54 PCI support"
-       depends on P54_COMMON && PCI
-       ---help---
-         This driver is for PCI isl38xx based wireless cards.
-         This driver supports most devices that are supported by the
-         fullmac prism54 driver plus many devices which are not
-         supported by the fullmac driver/firmware.
-
-         This driver requires softmac firmware which can be found at
-         http://prism54.org/
-
-         If you choose to build a module, it'll be called p54pci.
-
+source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/ath5k/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"