Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / Kconfig

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 880c628dcd4ac4dd735485830da6bfd4a51d21d1..fa2399cbd5cab472074b51d64a117bff1feb1d59 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)"
@@ -11,7 +12,7 @@ config WLAN_PRE80211
          Say Y if you have any pre-802.11 wireless LAN hardware.
 
          This option does not affect the kernel build, it only
-         let's you choose drivers.
+         lets you choose drivers.
 
 config STRIP
        tristate "STRIP (Metricom starmode radio IP)"
@@ -112,7 +113,7 @@ config WLAN_80211
          Say Y if you have any 802.11 wireless LAN hardware.
 
          This option does not affect the kernel build, it only
-         let's you choose drivers.
+         lets you choose drivers.
 
 config PCMCIA_RAYCS
        tristate "Aviator/Raytheon 2.4MHz wireless support"
@@ -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,6 +266,26 @@ config IPW2200_DEBUG
 
          If you are not sure, say N here.
 
+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_DEBUG
+       bool "Enable full debugging output in the Libertas module."
+       depends on LIBERTAS
+       ---help---
+         Debugging support.
+
 config AIRO
        tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
        depends on ISA_DMA_API && WLAN_80211 && (PCI || BROKEN)
@@ -504,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"