summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2018-01-19 12:38:54 -0800
committerDmitry Shmidt <dimitrysh@google.com>2018-01-19 12:40:46 -0800
commitd1e01c326960e9f8c9be26147130fdb228b5b4bf (patch)
tree4f2f5965312e009a10e472c510635be6fc9d41bc
parent4e79a6f14cdb5b107c2e2a46b449b1b14b9690a8 (diff)
hikey960_defconfig: Remove unnecessary CONFIG_EXT4_FS_ENCRYPTION
Change-Id: Ifbf8730d305891d2e49ab877c64e3480fb52dd4e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--arch/arm64/configs/hikey960_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/configs/hikey960_defconfig b/arch/arm64/configs/hikey960_defconfig
index 144432590bb4..1439134c5cf7 100644
--- a/arch/arm64/configs/hikey960_defconfig
+++ b/arch/arm64/configs/hikey960_defconfig
@@ -480,7 +480,6 @@ CONFIG_ACPI=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_SECURITY=y
CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
CONFIG_BTRFS_FS=y
CONFIG_F2FS_FS=y
CONFIG_F2FS_FS_SECURITY=y
@@ -491,7 +490,6 @@ CONFIG_QUOTA=y
CONFIG_QFMT_V2=y
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
-CONFIG_SDCARD_FS=y
CONFIG_CUSE=y
CONFIG_OVERLAY_FS=y
CONFIG_MSDOS_FS=y
@@ -499,6 +497,7 @@ CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_HUGETLBFS=y
+CONFIG_SDCARD_FS=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
CONFIG_SQUASHFS_XATTR=y