Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 3c3ef966c95bc68173831c0a0ab79f89486f215b..3c8cf682e9bdfb0c76c057371906e146354c3563 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.
@@ -741,7 +740,6 @@ config P54_PCI
 source "drivers/net/wireless/ath5k/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/bcm43xx/Kconfig"
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"