Commit d6eb633f authored by Matt Helsley's avatar Matt Helsley Committed by David S. Miller

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: default avatarMatt Helsley <matthltc@us.ibm.com>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26285ba3
...@@ -541,6 +541,14 @@ config PID_NS ...@@ -541,6 +541,14 @@ config PID_NS
Unless you want to work with an experimental feature Unless you want to work with an experimental feature
say N here. 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 config BLK_DEV_INITRD
bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
depends on BROKEN || !FRV depends on BROKEN || !FRV
......
...@@ -24,14 +24,6 @@ if NET ...@@ -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 config COMPAT_NET_DEV_OPS
def_bool y def_bool y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment