Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'

[linux-2.6-block.git] / fs / ext4 / Kconfig

diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index efea5d5c44ce4e0cf0910db50020dca4008779c0..024f2284d3f6c03ec3a0b4697bc71cbe9d9b9e2e 100644 (file)
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -64,6 +64,28 @@ config EXT4_FS_SECURITY
          If you are not using a security module that requires using
          extended attributes for file security labels, say N.
 
+config EXT4_ENCRYPTION
+       tristate "Ext4 Encryption"
+       depends on EXT4_FS
+       select CRYPTO_AES
+       select CRYPTO_CBC
+       select CRYPTO_ECB
+       select CRYPTO_XTS
+       select CRYPTO_CTS
+       select CRYPTO_SHA256
+       select KEYS
+       select ENCRYPTED_KEYS
+       help
+         Enable encryption of ext4 files and directories.  This
+         feature is similar to ecryptfs, but it is more memory
+         efficient since it avoids caching the encrypted and
+         decrypted pages in the page cache.
+
+config EXT4_FS_ENCRYPTION
+       bool
+       default y
+       depends on EXT4_ENCRYPTION
+
 config EXT4_DEBUG
        bool "EXT4 debugging support"
        depends on EXT4_FS