From 47b8a09f3d9286a14d46b7cb1448e8fa8338fcfc Mon Sep 17 00:00:00 2001 From: Matt Helsley Date: Mon, 26 Jan 2009 12:25:55 -0800 Subject: [PATCH] --- yaml --- r: 130201 b: refs/heads/master c: d6eb633fe680c18119346a364acff7723245e278 h: refs/heads/master i: 130199: a12ec9503bd56d550c33c18e41c82eda6aba88ad v: v3 --- [refs] | 2 +- trunk/init/Kconfig | 8 ++++++++ trunk/net/Kconfig | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8c1b7c335f34..b218b2a20390 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26285ba35813063ade9abd2c2eaaddba9354f587 +refs/heads/master: d6eb633fe680c18119346a364acff7723245e278 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 2af83825634e..1e948825974c 100644 --- a/trunk/init/Kconfig +++ b/trunk/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/trunk/net/Kconfig b/trunk/net/Kconfig index bf2776018f71..cdb8fdef6c4a 100644 --- a/trunk/net/Kconfig +++ b/trunk/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