Merge remote-tracking branch 'backlight/for-backlight-next'

[linux] / fs / ubifs / Kconfig

diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
index bc1e082..9da2f13 100644 (file)
--- a/fs/ubifs/Kconfig
+++ b/fs/ubifs/Kconfig
@@ -8,6 +8,7 @@ config UBIFS_FS
        select CRYPTO_LZO if UBIFS_FS_LZO
        select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
        select CRYPTO_HASH_INFO
+       select UBIFS_FS_XATTR if FS_ENCRYPTION
        depends on MTD_UBI
        help
          UBIFS is a file system for flash devices which works on top of UBI.
@@ -60,17 +61,6 @@ config UBIFS_FS_XATTR
 
          If unsure, say Y.
 
-config UBIFS_FS_ENCRYPTION
-       bool "UBIFS Encryption"
-       depends on UBIFS_FS_XATTR && BLOCK
-       select FS_ENCRYPTION
-       default n
-       help
-         Enable encryption of UBIFS 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 UBIFS_FS_SECURITY
        bool "UBIFS Security Labels"
        depends on UBIFS_FS_XATTR