1 files changed, 27 insertions, 11 deletions

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index dd7dbf7b14d4..00a07f32a81e 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -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,6 +375,19 @@ 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 && (BROKEN || !M32R)