Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Jeff Garzik [Wed, 13 Jul 2005 20:23:51 +0000 (16:23 -0400)]
1  2 
include/linux/etherdevice.h
net/Kconfig

Simple merge
diff --cc net/Kconfig
@@@ -635,14 -226,9 +226,10 @@@ config NET_POLL_CONTROLLE
        def_bool NETPOLL
  
  source "net/ax25/Kconfig"
  source "net/irda/Kconfig"
  source "net/bluetooth/Kconfig"
 +source "net/ieee80211/Kconfig"
  
- source "drivers/net/Kconfig"
- endmenu
+ endif   # if NET
+ endmenu # Networking