]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
net: Move config NET_NS to from net/Kconfig to init/Kconfig
authorMatt Helsley <matthltc@us.ibm.com>
Mon, 26 Jan 2009 20:25:55 +0000 (12:25 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 26 Jan 2009 20:25:55 +0000 (12:25 -0800)
Make NET_NS available underneath the generic Namespaces config option
since all of the other namespace options are there.

Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
init/Kconfig
net/Kconfig

index 2af83825634e2acbde448f88655f855df226f0b7..1e948825974ce926da852a178dfa698e0e028005 100644 (file)
@@ -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
index bf2776018f71f352c38460b9d67904da3ed7a74e..cdb8fdef6c4aaac30b1ba6cf5ace134ea6bfcb89 100644 (file)
@@ -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