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

This project is archived. Its data is read-only.

Commit abadc79b authored Oct 23, 2013 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Oct 23, 2013

Merge "defconfig: Disable CONFIG_MSM_OCMEM_NONSECURE for msm8226"

parents 04270951 4b951ca9

arch/arm/configs/msm8226-perf_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,6 @@ CONFIG_MSM_ADSP_LOADER=y
	CONFIG_MSM_OCMEM=y		CONFIG_MSM_OCMEM=y
	CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y		CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y
	CONFIG_MSM_OCMEM_DEBUG=y		CONFIG_MSM_OCMEM_DEBUG=y
	CONFIG_MSM_OCMEM_NONSECURE=y
	CONFIG_MSM_OCMEM_POWER_DISABLE=y		CONFIG_MSM_OCMEM_POWER_DISABLE=y
	CONFIG_SENSORS_ADSP=y		CONFIG_SENSORS_ADSP=y
	CONFIG_MSM_RTB=y		CONFIG_MSM_RTB=y

arch/arm/configs/msm8226_defconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,6 @@ CONFIG_MSM_ADSP_LOADER=y
	CONFIG_MSM_OCMEM=y		CONFIG_MSM_OCMEM=y
	CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y		CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y
	CONFIG_MSM_OCMEM_DEBUG=y		CONFIG_MSM_OCMEM_DEBUG=y
	CONFIG_MSM_OCMEM_NONSECURE=y
	CONFIG_MSM_OCMEM_POWER_DISABLE=y		CONFIG_MSM_OCMEM_POWER_DISABLE=y
	CONFIG_SENSORS_ADSP=y		CONFIG_SENSORS_ADSP=y
	CONFIG_MSM_RTB=y		CONFIG_MSM_RTB=y