From 824f890c7cb8b180c0fc7269d4dd9a86200ea797 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 8 Feb 2008 04:18:25 -0800
Subject: [PATCH] --- yaml --- r: 84607 b: refs/heads/master c:
 cbdc73873229754ab3e673ea8c82eaf9ae3c646f h: refs/heads/master i:   84605:
 f7c3e359d0f671263e5b4dceaaf979a9c5e7dfe4   84603:
 0053797bd2487ca1b9b7c987127551435ea9a671   84599:
 4b21bf8632751650c8d63eed6b5fcb1a6ca488f3   84591:
 d12cd1c909e470b1172e3b8bd2b482dae9aba01e   84575:
 9b22f19618adeac76a03896fc87b41abd38a250e   84543:
 d7c18b18832d0617e5026f955a3b8323404994cf   84479:
 e30caf16271c4c0cce33cdb1335ce842cf1ef318 v: v3

---
 [refs]            | 2 +-
 trunk/net/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 745cbf01cc92..e8119301853f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74bd59bb39eb08b4379e2590c5f160748d83f812
+refs/heads/master: cbdc73873229754ab3e673ea8c82eaf9ae3c646f
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
index b6a5d454f2ff..6627c6ae5db6 100644
--- a/trunk/net/Kconfig
+++ b/trunk/net/Kconfig
@@ -30,7 +30,7 @@ menu "Networking options"
 config NET_NS
 	bool "Network namespace support"
 	default n
-	depends on EXPERIMENTAL && !SYSFS
+	depends on EXPERIMENTAL && !SYSFS && NAMESPACES
 	help
 	  Allow user space to create what appear to be multiple instances
 	  of the network stack.