From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 13 Jul 2005 20:23:51 +0000 (-0400)
Subject: Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
X-Git-Tag: v2.6.14-rc1~1017^2~40^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=327309e899662b482c58cf25f574513d38b5788c;p=linux-2.6-omap-h63xx.git

Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
---

327309e899662b482c58cf25f574513d38b5788c
diff --cc net/Kconfig
index 8a12ea8f0c0,2684e809a64..3ae4a47e60a
--- a/net/Kconfig
+++ b/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