From cbf9a4eae95b727ee6837a812627191ead311aca Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Wed, 27 Oct 2010 15:34:38 -0700
Subject: [PATCH] --- yaml --- r: 218605 b: refs/heads/master c:
 8dd2a82c29111bb8ad2a2933aa269b49f72d356d h: refs/heads/master i:   218603:
 9bf44249d7e9c35a9a19314e0f50f4e0cca61bed v: v3

---
 [refs]             |  2 +-
 trunk/init/Kconfig | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 63034fc13f73..324262660f27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17a6d4411a4dc7e436e1a71c24e10048452edd98
+refs/heads/master: 8dd2a82c29111bb8ad2a2933aa269b49f72d356d
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 239fae49750b..5b3a3942a98c 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -734,7 +734,7 @@ config RELAY
 
 	  If unsure, say N.
 
-config NAMESPACES
+menuconfig NAMESPACES
 	bool "Namespaces support" if EMBEDDED
 	default !EMBEDDED
 	help
@@ -743,9 +743,10 @@ config NAMESPACES
 	  or same user id or pid may refer to different tasks when used in
 	  different namespaces.
 
+if NAMESPACES
+
 config UTS_NS
 	bool "UTS namespace"
-	depends on NAMESPACES
 	default y
 	help
 	  In this namespace tasks see different info provided with the
@@ -753,7 +754,7 @@ config UTS_NS
 
 config IPC_NS
 	bool "IPC namespace"
-	depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
+	depends on (SYSVIPC || POSIX_MQUEUE)
 	default y
 	help
 	  In this namespace tasks work with IPC ids which correspond to
@@ -761,7 +762,7 @@ config IPC_NS
 
 config USER_NS
 	bool "User namespace (EXPERIMENTAL)"
-	depends on NAMESPACES && EXPERIMENTAL
+	depends on EXPERIMENTAL
 	default y
 	help
 	  This allows containers, i.e. vservers, to use user namespaces
@@ -770,7 +771,6 @@ config USER_NS
 
 config PID_NS
 	bool "PID Namespaces"
-	depends on NAMESPACES
 	default y
 	help
 	  Support process id namespaces.  This allows having multiple
@@ -779,12 +779,14 @@ config PID_NS
 
 config NET_NS
 	bool "Network namespace"
-	depends on NAMESPACES && NET
+	depends on NET
 	default y
 	help
 	  Allow user space to create what appear to be multiple instances
 	  of the network stack.
 
+endif # NAMESPACES
+
 config BLK_DEV_INITRD
 	bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
 	depends on BROKEN || !FRV