net: Move config NET_NS to from net/Kconfig to init/Kconfig

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>

diff --git a/init/Kconfig b/init/Kconfig
index 2af8382..1e94882 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -541,6 +541,14 @@ config PID_NS
          Unless you want to work with an experimental feature
          say N here.
 
          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
 config BLK_DEV_INITRD
        bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
        depends on BROKEN || !FRV

diff --git a/net/Kconfig b/net/Kconfig
index bf27760..cdb8fde 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -24,14 +24,6 @@ if NET
 
 menu "Networking options"
 
 
 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
 
 config COMPAT_NET_DEV_OPS
        def_bool y