diff options
author | Matt Helsley <matthltc@us.ibm.com> | 2009-01-26 15:25:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-26 15:25:55 -0500 |
commit | d6eb633fe680c18119346a364acff7723245e278 (patch) | |
tree | 861608b5c9de7cf40f6e02ed568cd402c137818d /init/Kconfig | |
parent | 26285ba35813063ade9abd2c2eaaddba9354f587 (diff) |
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>
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 8 |
1 files changed, 8 insertions, 0 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 | |||
541 | Unless you want to work with an experimental feature | 541 | Unless you want to work with an experimental feature |
542 | say N here. | 542 | say N here. |
543 | 543 | ||
544 | config NET_NS | ||
545 | bool "Network namespace" | ||
546 | default n | ||
547 | depends on NAMESPACES && EXPERIMENTAL && NET | ||
548 | help | ||
549 | Allow user space to create what appear to be multiple instances | ||
550 | of the network stack. | ||
551 | |||
544 | config BLK_DEV_INITRD | 552 | config BLK_DEV_INITRD |
545 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" | 553 | bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" |
546 | depends on BROKEN || !FRV | 554 | depends on BROKEN || !FRV |