diff options
| author | Matt Helsley <matthltc@us.ibm.com> | 2009-01-26 12:25:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 12:25:55 -0800 |
| commit | d6eb633fe680c18119346a364acff7723245e278 (patch) | |
| tree | 861608b5c9de7cf40f6e02ed568cd402c137818d | |
| parent | 26285ba35813063ade9abd2c2eaaddba9354f587 (diff) | |
| download | linux-d6eb633fe680c18119346a364acff7723245e278.tar.bz2 | |
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>
| -rw-r--r-- | init/Kconfig | 8 | ||||
| -rw-r--r-- | net/Kconfig | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig index 2af83825634e..1e948825974c 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 bf2776018f71..cdb8fdef6c4a 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 |