/spare/repo/netdev-2.6 branch 'ieee80211'

diff --combined drivers/net/wireless/Kconfig
index 5d814dfc8bc09796fbdd66892bf2c06929b94946,9d4c2fb671e2ee2b1f4577014d3b3c1b44f3d2f2..dd7dbf7b14d4514965655361f03d3e4ba9a707ee
--- 1/drivers/net/wireless/Kconfig
--- 2/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@@ -164,7 -164,7 +164,7 @@@ config IPW210
            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---
@@@ -459,8 -459,6 +459,8 @@@ config PRISM5
          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