diff options
-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 | |||
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 |
diff --git a/net/Kconfig b/net/Kconfig index bf2776018f71..cdb8fdef6c4a 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
@@ -24,14 +24,6 @@ if NET | |||
24 | 24 | ||
25 | menu "Networking options" | 25 | menu "Networking options" |
26 | 26 | ||
27 | config NET_NS | ||
28 | bool "Network namespace support" | ||
29 | default n | ||
30 | depends on EXPERIMENTAL && NAMESPACES | ||
31 | help | ||
32 | Allow user space to create what appear to be multiple instances | ||
33 | of the network stack. | ||
34 | |||
35 | config COMPAT_NET_DEV_OPS | 27 | config COMPAT_NET_DEV_OPS |
36 | def_bool y | 28 | def_bool y |
37 | 29 | ||