From: Matt Helsley Date: Mon, 26 Jan 2009 20:25:55 +0000 (-0800) Subject: net: Move config NET_NS to from net/Kconfig to init/Kconfig X-Git-Tag: v2.6.29-rc3~23^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d6eb633fe680c18119346a364acff7723245e278;p=linux-2.6-omap-h63xx.git 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 Acked-by: Serge Hallyn Signed-off-by: David S. Miller --- diff --git a/init/Kconfig b/init/Kconfig index 2af83825634..1e948825974 100644 --- 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. +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/net/Kconfig b/net/Kconfig index bf2776018f7..cdb8fdef6c4 100644 --- a/net/Kconfig +++ b/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