Merge branch 'for-2.6.23' into merge

[pandora-kernel.git] / drivers / net / wireless / Kconfig

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index c4b3dc2..ae27af0 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -3,6 +3,7 @@
 #
 
 menu "Wireless LAN"
+       depends on !S390
 
 config WLAN_PRE80211
        bool "Wireless LAN (pre-802.11)"
@@ -153,8 +154,8 @@ config IPW2100
  
           If you want to compile the driver as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt>.  The module
-          will be called ipw2100.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ipw2100.ko.
        
 config IPW2100_MONITOR
         bool "Enable promiscuous mode"
@@ -208,8 +209,8 @@ config IPW2200
  
           If you want to compile the driver as a module ( = code which can be
           inserted in and removed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt>.  The module
-          will be called ipw2200.ko.
+          say M here and read <file:Documentation/kbuild/modules.txt>.
+          The module will be called ipw2200.ko.
 
 config IPW2200_MONITOR
         bool "Enable promiscuous mode"
@@ -265,16 +266,23 @@ config IPW2200_DEBUG
 
          If you are not sure, say N here.
 
-config LIBERTAS_USB
-       tristate "Marvell Libertas 8388 802.11a/b/g cards"
-       depends on NET_RADIO && USB
+config LIBERTAS
+       tristate "Marvell 8xxx Libertas WLAN driver support"
+       depends on WLAN_80211
+       select IEEE80211
        select FW_LOADER
+       ---help---
+         A library for Marvell Libertas 8xxx devices.
+
+config LIBERTAS_USB
+       tristate "Marvell Libertas 8388 USB 802.11b/g cards"
+       depends on LIBERTAS && USB
        ---help---
          A driver for Marvell Libertas 8388 USB devices.
 
-config LIBERTAS_USB_DEBUG
-       bool "Enable full debugging output in the Libertas USB module."
-       depends on LIBERTAS_USB
+config LIBERTAS_DEBUG
+       bool "Enable full debugging output in the Libertas module."
+       depends on LIBERTAS
        ---help---
          Debugging support.
 
@@ -517,8 +525,8 @@ config PRISM54
          
          If you want to compile the driver as a module ( = code which can be
          inserted in and removed from the running kernel whenever you want),
-         say M here and read <file:Documentation/modules.txt>.  The module
-         will be called prism54.ko.
+         say M here and read <file:Documentation/kbuild/modules.txt>.
+         The module will be called prism54.ko.
 
 config USB_ZD1201
        tristate "USB ZD1201 based Wireless device support"
@@ -538,6 +546,18 @@ config USB_ZD1201
          To compile this driver as a module, choose M here: the
          module will be called zd1201.
 
+config RTL8187
+       tristate "Realtek 8187 USB support"
+       depends on MAC80211 && USB && WLAN_80211 && EXPERIMENTAL
+       select EEPROM_93CX6
+       ---help---
+         This is a driver for RTL8187 based cards.
+         These are USB based chips found in cards such as:
+
+         Netgear WG111v2
+
+         Thanks to Realtek for their support!
+
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/bcm43xx/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"