commit aeda0e53bea08556ecc7fbf50b62e894f64d68b2
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 30 00:56:13 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 30 00:56:12 2018 -0700
tree d2907d60f4b479cfab19483f16d471b03be86c0d
parent 5fd4de55eb08ffb0cab73e5715c1b8d8f0e571b3
parent 3ee723e94f7436371ef768227b979b4030e517b6

Merge "defconfig: 8953_64: enable default key driver"

arch/arm64/configs/msm8953-perf_defconfig

diff --git a/arch/arm64/configs/msm8953-perf_defconfig b/arch/arm64/configs/msm8953-perf_defconfig
index a66ea31..3039177 100644
--- a/arch/arm64/configs/msm8953-perf_defconfig
+++ b/arch/arm64/configs/msm8953-perf_defconfig
@@ -265,6 +265,7 @@
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_DM_REQ_CRYPT=y
+CONFIG_DM_DEFAULT_KEY=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_VERITY=y
 CONFIG_DM_VERITY_FEC=y

arch/arm64/configs/msm8953_defconfig

diff --git a/arch/arm64/configs/msm8953_defconfig b/arch/arm64/configs/msm8953_defconfig
index 34d16db..4620bec 100644
--- a/arch/arm64/configs/msm8953_defconfig
+++ b/arch/arm64/configs/msm8953_defconfig
@@ -271,6 +271,7 @@
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_CRYPT=y
 CONFIG_DM_REQ_CRYPT=y
+CONFIG_DM_DEFAULT_KEY=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_VERITY=y
 CONFIG_DM_VERITY_FEC=y