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

[linux-2.6.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 2684e809a64927fb4f1f7955233848019f76da1e..3ae4a47e60aeaab448bdca858174aba1f50ec792 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -228,6 +228,7 @@ config NET_POLL_CONTROLLER
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"

+source "net/ieee80211/Kconfig"

 
 endif   # if NET
 endmenu # Networking
 
 endif   # if NET
 endmenu # Networking