---

yaml --- r: 130201 b: refs/heads/master c: d6eb633 h: refs/heads/master i: 130199: a12ec95 v: v3
git-mirror · Jan 26, 2009 · 47b8a09 · 47b8a09
1 parent a87f5db
commit 47b8a09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26285ba35813063ade9abd2c2eaaddba9354f587
+refs/heads/master: d6eb633fe680c18119346a364acff7723245e278
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
@@ -541,6 +541,14 @@ config PID_NS
 	  Unless you want to work with an experimental feature
 	  say N here.
 
+config NET_NS
+	bool "Network namespace"
+	default n
+	depends on NAMESPACES && EXPERIMENTAL && NET
+	help
+	  Allow user space to create what appear to be multiple instances
+	  of the network stack.
+
 config BLK_DEV_INITRD
 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
 	depends on BROKEN || !FRV

diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
@@ -24,14 +24,6 @@ if NET
 
 menu "Networking options"
 
-config NET_NS
-	bool "Network namespace support"
-	default n
-	depends on EXPERIMENTAL && NAMESPACES
-	help
-	  Allow user space to create what appear to be multiple instances
-	  of the network stack.
-
 config COMPAT_NET_DEV_OPS
        def_bool y