Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index d20e0da05a26eab996841f5c678f11d54a8fb460..7187958e40caac43da202b11ea7c1d2ff50daeaf 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -164,7 +164,7 @@ config IPW2100
           say M here and read <file:Documentation/modules.txt>.  The module
           will be called ipw2100.ko.
        
-config IPW2100_PROMISC
+config IPW2100_MONITOR
         bool "Enable promiscuous mode"
         depends on IPW2100
         ---help---
@@ -243,7 +243,7 @@ config IPW_DEBUG
 
 config AIRO
        tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
-       depends on NET_RADIO && ISA && (PCI || BROKEN)
+       depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN)
        ---help---
          This is the standard Linux driver to support Cisco/Aironet ISA and
          PCI 802.11 wireless cards.
@@ -289,8 +289,8 @@ config APPLE_AIRPORT
          a non-standard interface
 
 config PLX_HERMES
-       tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.) (EXPERIMENTAL)"
-       depends on PCI && HERMES && EXPERIMENTAL
+       tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)"
+       depends on PCI && HERMES
        help
          Enable support for PCMCIA cards supported by the "Hermes" (aka
          orinoco) driver when used in PLX9052 based PCI adaptors.  These
@@ -299,12 +299,9 @@ config PLX_HERMES
          802.11b PCMCIA cards can be used in desktop machines.  The Netgear
          MA301 is such an adaptor.
 
-         Support for these adaptors is so far still incomplete and buggy.
-         You have been warned.
-
 config TMD_HERMES
-       tristate "Hermes in TMD7160 based PCI adaptor support (EXPERIMENTAL)"
-       depends on PCI && HERMES && EXPERIMENTAL
+       tristate "Hermes in TMD7160 based PCI adaptor support"
+       depends on PCI && HERMES
        help
          Enable support for PCMCIA cards supported by the "Hermes" (aka
          orinoco) driver when used in TMD7160 based PCI adaptors.  These
@@ -312,12 +309,18 @@ config TMD_HERMES
          PCI <-> PCMCIA bridge.  Several vendors sell such adaptors so that
          802.11b PCMCIA cards can be used in desktop machines.
 
-         Support for these adaptors is so far still incomplete and buggy.
-         You have been warned.
+config NORTEL_HERMES
+       tristate "Nortel emobility PCI adaptor support"
+       depends on PCI && HERMES
+       help
+         Enable support for PCMCIA cards supported by the "Hermes" (aka
+         orinoco) driver when used in Nortel emobility PCI adaptors.  These
+         adaptors are not full PCMCIA controllers, but act as a more limited
+         PCI <-> PCMCIA bridge.
 
 config PCI_HERMES
-       tristate "Prism 2.5 PCI 802.11b adaptor support (EXPERIMENTAL)"
-       depends on PCI && HERMES && EXPERIMENTAL
+       tristate "Prism 2.5 PCI 802.11b adaptor support"
+       depends on PCI && HERMES
        help
          Enable support for PCI and mini-PCI 802.11b wireless NICs based on
          the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b
@@ -372,9 +375,22 @@ config PCMCIA_HERMES
          configure your card and that /etc/pcmcia/wireless.opts works:
          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
 
+config PCMCIA_SPECTRUM
+       tristate "Symbol Spectrum24 Trilogy PCMCIA card support"
+       depends on NET_RADIO && PCMCIA && HERMES
+       ---help---
+
+         This is a driver for 802.11b cards using RAM-loadable Symbol
+         firmware, such as Symbol Wireless Networker LA4100, CompactFlash
+         cards by Socket Communications and Intel PRO/Wireless 2011B.
+
+         This driver requires firmware download on startup.  Utilities
+         for downloading Symbol firmware are available at
+         <http://sourceforge.net/projects/orinoco/>
+
 config AIRO_CS
        tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
-       depends on NET_RADIO && PCMCIA
+       depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
        ---help---
          This is the standard Linux driver to support Cisco/Aironet PCMCIA
          802.11 wireless cards.  This driver is the same as the Aironet
@@ -459,6 +475,8 @@ config PRISM54
          say M here and read <file:Documentation/modules.txt>.  The module
          will be called prism54.ko.
 
+source "drivers/net/wireless/hostap/Kconfig"
+
 # yes, this works even when no drivers are selected
 config NET_WIRELESS
        bool