summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-02 11:19:20 -0700
committerKees Cook <keescook@chromium.org>2013-01-11 11:39:04 -0800
commit336d6d0323a58702caec260245376843d43f1945 (patch)
treef4397f20c9ee7e58ead5b33d0156fbb274ddf734
parent1b6a78a52262495c26fe8ec58cc8f7a6f8425d7c (diff)
downloadlinux-3.10-336d6d0323a58702caec260245376843d43f1945.tar.gz
linux-3.10-336d6d0323a58702caec260245376843d43f1945.tar.bz2
linux-3.10-336d6d0323a58702caec260245376843d43f1945.zip
fs/ecryptfs: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it from any "depends on" lines in Kconfigs. CC: Tyler Hicks <tyhicks@canonical.com> CC: Dustin Kirkland <dustin.kirkland@gazzang.com> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
-rw-r--r--fs/ecryptfs/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/Kconfig b/fs/ecryptfs/Kconfig
index cc16562654d..e15ef38c24f 100644
--- a/fs/ecryptfs/Kconfig
+++ b/fs/ecryptfs/Kconfig
@@ -1,6 +1,6 @@
config ECRYPT_FS
- tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
- depends on EXPERIMENTAL && KEYS && CRYPTO && (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n)
+ tristate "eCrypt filesystem layer support"
+ depends on KEYS && CRYPTO && (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n)
select CRYPTO_ECB
select CRYPTO_CBC
select CRYPTO_MD5