diff options
| author | Roberto Sassu <roberto.sassu@polito.it> | 2011-08-01 13:33:38 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:55:27 -0600 |
| commit | fb3ce4ef43a6a95da0f7f0d54546c3cdaa17fe4c (patch) | |
| tree | 6e1c76586838383571886d65475fbee34190d6a1 /fs | |
| parent | 4849b797320ee360e63da83428b3b4797e731fec (diff) | |
eCryptfs: fix compile error
This patch fixes the compile error reported at the address:
https://bugzilla.kernel.org/show_bug.cgi?id=40292
The problem arises when compiling eCryptfs as built-in and the 'encrypted'
key type as a module. The patch prevents this combination from being set in
the kernel configuration, by fixing the eCryptfs dependencies.
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Reported-by: David Hill <hilld@binarystorm.net>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
(cherry picked from commit 4b6fee17b1758391281ddf5b00328035573f8be1)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ecryptfs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/Kconfig b/fs/ecryptfs/Kconfig index 1cd6d9d3e29..cc16562654d 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 + depends on EXPERIMENTAL && KEYS && CRYPTO && (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n) select CRYPTO_ECB select CRYPTO_CBC select CRYPTO_MD5 |