X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=net%2FKconfig;h=ab4e6da5012f1e1d2ef45436fa863d80655f75e2;hb=0ed5462927211286502576142bd322d850b49a86;hp=f3de72978ab61e1866e1fa4e2d585abaf5496901;hpb=f54bfc0e34dbd15e9df099a8e36a346c6c583f3c;p=sfrench%2Fcifs-2.6.git

diff --git a/net/Kconfig b/net/Kconfig
index f3de72978ab6..ab4e6da5012f 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"
@@ -227,6 +235,7 @@ source "net/ieee80211/Kconfig"
 endmenu
 
 source "net/rfkill/Kconfig"
+source "net/9p/Kconfig"
 
 endif   # if NET
 endmenu # Networking