Automatic merge of /spare/repo/netdev-2.6 branch we18

diff --combined drivers/net/wireless/Kconfig
index a22b1e7c65ba0a5fd92d0777b2daded72dcdac67,1d3231cc471acff346ef9dd6425d66c1b96c4276..3c81e0f2b0565235c7099d7d4db3c950e59bc782
--- 1/drivers/net/wireless/Kconfig
--- 2/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@@ -137,111 -137,6 +137,111 @@@ config PCMCIA_RAYC
  comment "Wireless 802.11b ISA/PCI cards support"
        depends on NET_RADIO && (ISA || PCI || PPC_PMAC || PCMCIA)
  
 +config IPW2100
 +      tristate "Intel PRO/Wireless 2100 Network Connection"
 +      depends on NET_RADIO && PCI && IEEE80211
 +      select FW_LOADER
 +      ---help---
 +          A driver for the Intel PRO/Wireless 2100 Network 
 +        Connection 802.11b wireless network adapter.
 +
 +          See <file:Documentation/networking/README.ipw2100> for information on
 +          the capabilities currently enabled in this driver and for tips
 +          for debugging issues and problems.
 +
 +        In order to use this driver, you will need a firmware image for it.
 +          You can obtain the firmware from
 +        <http://ipw2100.sf.net/>.  Once you have the firmware image, you 
 +        will need to place it in /etc/firmware.
 +
 +          You will also very likely need the Wireless Tools in order to
 +          configure your card:
 +
 +          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
 + 
 +          If you want to compile the driver as a module ( = code which can be
 +          inserted in and remvoed from the running kernel whenever you want),
 +          say M here and read <file:Documentation/modules.txt>.  The module
 +          will be called ipw2100.ko.
 +      
 +config IPW2100_PROMISC
 +        bool "Enable promiscuous mode"
 +        depends on IPW2100
 +        ---help---
 +        Enables promiscuous/monitor mode support for the ipw2100 driver.
 +        With this feature compiled into the driver, you can switch to 
 +        promiscuous mode via the Wireless Tool's Monitor mode.  While in this
 +        mode, no packets can be sent.
 +
 +config IPW_DEBUG
 +      bool "Enable full debugging output in IPW2100 module."
 +      depends on IPW2100
 +      ---help---
 +        This option will enable debug tracing output for the IPW2100.  
 +
 +        This will result in the kernel module being ~60k larger.  You can 
 +        control which debug output is sent to the kernel log by setting the 
 +        value in 
 +
 +        /sys/bus/pci/drivers/ipw2100/debug_level
 +
 +        This entry will only exist if this option is enabled.
 +
 +        If you are not trying to debug or develop the IPW2100 driver, you 
 +        most likely want to say N here.
 +
 +config IPW2200
 +      tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
 +      depends on NET_RADIO && PCI
 +      select FW_LOADER
 +      select IEEE80211
 +      ---help---
 +          A driver for the Intel PRO/Wireless 2200BG and 2915ABG Network
 +        Connection adapters. 
 +
 +          See <file:Documentation/networking/README.ipw2200> for 
 +        information on the capabilities currently enabled in this 
 +        driver and for tips for debugging issues and problems.
 +
 +        In order to use this driver, you will need a firmware image for it.
 +          You can obtain the firmware from
 +        <http://ipw2200.sf.net/>.  See the above referenced README.ipw2200 
 +        for information on where to install the firmare images.
 +
 +          You will also very likely need the Wireless Tools in order to
 +          configure your card:
 +
 +          <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>.
 + 
 +          If you want to compile the driver as a module ( = code which can be
 +          inserted in and remvoed from the running kernel whenever you want),
 +          say M here and read <file:Documentation/modules.txt>.  The module
 +          will be called ipw2200.ko.
 +
 +config IPW_DEBUG
 +      bool "Enable full debugging output in IPW2200 module."
 +      depends on IPW2200
 +      ---help---
 +        This option will enable debug tracing output for the IPW2200.  
 +
 +        This will result in the kernel module being ~100k larger.  You can 
 +        control which debug output is sent to the kernel log by setting the 
 +        value in 
 +
 +        /sys/bus/pci/drivers/ipw2200/debug_level
 +
 +        This entry will only exist if this option is enabled.
 +
 +        To set a value, simply echo an 8-byte hex value to the same file:
 +
 +        % echo 0x00000FFO > /sys/bus/pci/drivers/ipw2200/debug_level
 +
 +        You can find the list of debug mask values in 
 +        drivers/net/wireless/ipw2200.h
 +
 +        If you are not trying to debug or develop the IPW2200 driver, you 
 +        most likely want to say N here.
 +
  config AIRO
        tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
        depends on NET_RADIO && ISA && (PCI || BROKEN)
@@@ -428,7 -323,7 +428,7 @@@ config PRISM5
          For a complete list of supported cards visit <http://prism54.org>.
          Here is the latest confirmed list of supported cards:
  
-         3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72
+         3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72 (version 1)
          Allnet ALL0271 PCI Card
          Compex WL54G Cardbus Card
          Corega CG-WLCB54GT Cardbus Card