Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

[sfrench/cifs-2.6.git] / fs / ext4 / Kconfig

diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index a453cc87082b5d1196a45bdd8aed8c67f9eb9ee3..031e5a82d556dbe9d4bd2cff39d1b8c4e162b659 100644 (file)
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -96,21 +96,6 @@ 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
-       bool "Ext4 Encryption"
-       depends on EXT4_FS
-       select FS_ENCRYPTION
-       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