mwifiex: move under marvell vendor directory

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

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 73e3b53..4656652 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -22,6 +22,7 @@ source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
+source "drivers/net/wireless/marvell/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 
 config PCMCIA_RAYCS
@@ -39,25 +40,6 @@ config PCMCIA_RAYCS
          To compile this driver as a module, choose M here: the module will be
          called ray_cs.  If unsure, say N.
 
-config LIBERTAS_THINFIRM
-       tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
-       depends on MAC80211
-       select FW_LOADER
-       ---help---
-         A library for Marvell Libertas 8xxx devices using thinfirm.
-
-config LIBERTAS_THINFIRM_DEBUG
-       bool "Enable full debugging output in the Libertas thin firmware module."
-       depends on LIBERTAS_THINFIRM
-       ---help---
-         Debugging support.
-
-config LIBERTAS_THINFIRM_USB
-       tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
-       depends on LIBERTAS_THINFIRM && USB
-       ---help---
-         A driver for Marvell Libertas 8388 USB devices using thinfirm.
-
 config PCMCIA_WL3501
        tristate "Planet WL3501 PCMCIA cards"
        depends on CFG80211 && PCMCIA
@@ -162,9 +144,6 @@ config MWL8K
 
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/iwlegacy/Kconfig"
-source "drivers/net/wireless/libertas/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
@@ -173,7 +152,6 @@ source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
 source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
-source "drivers/net/wireless/mwifiex/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 
 endif # WLAN