Merge commit 'origin/master' into next

1 files changed, 14 insertions, 6 deletions

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 3359497012aa..5bc00db21b24 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -146,14 +146,14 @@ config LIBERTAS_CS
           A driver for Marvell Libertas 8385 CompactFlash devices.
 
 config LIBERTAS_SDIO
-        tristate "Marvell Libertas 8385 and 8686 SDIO 802.11b/g cards"
+        tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
         depends on LIBERTAS && MMC
         ---help---
-          A driver for Marvell Libertas 8385 and 8686 SDIO devices.
+          A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
 
 config LIBERTAS_SPI
         tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
-        depends on LIBERTAS && SPI && GENERIC_GPIO
+        depends on LIBERTAS && SPI
         ---help---
           A driver for Marvell Libertas 8686 SPI devices.
 
@@ -333,6 +333,7 @@ config USB_ZD1201
 config USB_NET_RNDIS_WLAN
         tristate "Wireless RNDIS USB support"
         depends on USB && WLAN_80211 && EXPERIMENTAL
+        depends on CFG80211
         select USB_USBNET
         select USB_NET_CDCETHER
         select USB_NET_RNDIS_HOST
@@ -434,6 +435,13 @@ config RTL8187
 
           Thanks to Realtek for their support!
 
+# If possible, automatically enable LEDs for RTL8187.
+
+config RTL8187_LEDS
+        bool
+        depends on RTL8187 && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = RTL8187)
+        default y
+
 config ADM8211
         tristate "ADMtek ADM8211 support"
         depends on MAC80211 && PCI && WLAN_80211 && EXPERIMENTAL
@@ -484,9 +492,7 @@ config MWL8K
           will be called mwl8k.  If unsure, say N.
 
 source "drivers/net/wireless/p54/Kconfig"
-source "drivers/net/wireless/ath5k/Kconfig"
-source "drivers/net/wireless/ath9k/Kconfig"
-source "drivers/net/wireless/ar9170/Kconfig"
+source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/ipw2x00/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
@@ -495,5 +501,7 @@ source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
+source "drivers/net/wireless/wl12xx/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
 
 endmenu