Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index e2d9b3b9cda4d3042c601fb5d51556ba44558ff3..cdba08ca2efe6145464c1f55516c672dd303892c 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -212,14 +212,23 @@ endmenu
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"
-source "net/ieee80211/Kconfig"
-
-config WIRELESS_EXT
-       bool
+source "net/rxrpc/Kconfig"
 
 config FIB_RULES
        bool
 
+menu "Wireless"
+       depends on !S390
+
+source "net/wireless/Kconfig"
+source "net/mac80211/Kconfig"
+source "net/ieee80211/Kconfig"
+
+endmenu
+
+source "net/rfkill/Kconfig"
+source "net/9p/Kconfig"
+
 endif   # if NET
 endmenu # Networking