From 55912439bb21fa01c71a14e73e27508eafb8841b Mon Sep 17 00:00:00 2001
From: Roberto Sassu <roberto.sassu@polito.it>
Date: Mon, 1 Aug 2011 13:33:38 +0200
Subject: [PATCH] --- yaml --- r: 262701 b: refs/heads/master c:
 4b6fee17b1758391281ddf5b00328035573f8be1 h: refs/heads/master i:   262699:
 1e139513c784592d92644c40ba4611415d5c804f v: v3

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

diff --git a/[refs] b/[refs]
index 7ef02b240b91..d22d982e9d6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f61500e000eedc0c7a0201200a7f00ba5529c002
+refs/heads/master: 4b6fee17b1758391281ddf5b00328035573f8be1
diff --git a/trunk/fs/ecryptfs/Kconfig b/trunk/fs/ecryptfs/Kconfig
index 1cd6d9d3e29a..cc16562654de 100644
--- a/trunk/fs/ecryptfs/Kconfig
+++ b/trunk/fs/ecryptfs/Kconfig
@@ -1,6 +1,6 @@
 config ECRYPT_FS
 	tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && KEYS && CRYPTO
+	depends on EXPERIMENTAL && KEYS && CRYPTO && (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n)
 	select CRYPTO_ECB
 	select CRYPTO_CBC
 	select CRYPTO_MD5