Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db433976 authored Feb 02, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Feb 02, 2016

Merge "defconfig: msm: Enable MSM_GLADIATOR_ERP flag for msmtitanium"

parents 0bb5df7f 13380e18

arch/arm/configs/msmcortex_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -483,6 +483,8 @@ CONFIG_QPNP_HAPTIC=y
		CONFIG_MSM_SPMI=y
		CONFIG_MSM_SPMI_PMIC_ARB=y
		CONFIG_MSM_QPNP_INT=y
		CONFIG_MSM_GLADIATOR_ERP=y
		CONFIG_PANIC_ON_GLADIATOR_ERROR=y
		CONFIG_MSM_ADSP_LOADER=y
		CONFIG_MSM_MEMORY_DUMP_V2=y
		CONFIG_MSM_BOOT_STATS=y

arch/arm64/configs/msmcortex_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -506,6 +506,8 @@ CONFIG_MSM_SPMI=y
		CONFIG_MSM_SPMI_PMIC_ARB=y
		CONFIG_MSM_QPNP_INT=y
		CONFIG_CP_ACCESS64=y
		CONFIG_MSM_GLADIATOR_ERP=y
		CONFIG_PANIC_ON_GLADIATOR_ERROR=y
		CONFIG_MSM_ADSP_LOADER=y
		CONFIG_MSM_MEMORY_DUMP_V2=y
		CONFIG_MSM_DEBUG_LAR_UNLOCK=y