summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-19 23:28:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-19 23:28:14 -0700
commitafc144d22c0167b44eeaa77a480d048fe81cc51a (patch)
tree88d933c8060ff94ecfc3f8843e5d6b31d72a3daf
parent48b6dc8c1e8c627f5814bc24fabd00c5b908bb79 (diff)
parent95a1ccc1303bfa6693d29e69df39b27c0241d830 (diff)
Merge "defconfig: msmcortex: Remove panic on SBE"
-rw-r--r--arch/arm64/configs/msmcortex_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index 456979c31d84..9e2727c4fe1e 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -462,7 +462,6 @@ CONFIG_SWITCH=y
CONFIG_EDAC=y
CONFIG_EDAC_MM_EDAC=y
CONFIG_EDAC_CORTEX_ARM64=y
-CONFIG_EDAC_CORTEX_ARM64_PANIC_ON_CE=y
CONFIG_EDAC_CORTEX_ARM64_PANIC_ON_UE=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_QPNP=y