X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2FKconfig;h=ab4e6da5012f1e1d2ef45436fa863d80655f75e2;hb=fc5019c5c7067bcea1e49fe9cd5190285f0c8927;hp=caeacd16656a044588d54b3ede24ea80e0252c59;hpb=cf4328cd949c2086091c62c5685f1580fe9b55e4;p=linux-2.6-omap-h63xx.git

diff --git a/net/Kconfig b/net/Kconfig
index caeacd16656..ab4e6da5012 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -27,6 +27,14 @@ if NET
 
 menu "Networking options"
 
+config NET_NS
+	bool "Network namespace support"
+	default n
+	depends on EXPERIMENTAL && !SYSFS
+	help
+	  Allow user space to create what appear to be multiple instances
+	  of the network stack.
+
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
@@ -218,6 +226,7 @@ config FIB_RULES
 	bool
 
 menu "Wireless"
+	depends on !S390
 
 source "net/wireless/Kconfig"
 source "net/mac80211/Kconfig"
@@ -226,6 +235,7 @@ source "net/ieee80211/Kconfig"
 endmenu
 
 source "net/rfkill/Kconfig"
+source "net/9p/Kconfig"
 
 endif   # if NET
 endmenu # Networking