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 30a42b52 authored Dec 17, 2013 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 17, 2013

Merge "defconfig: Disable OCMEM on msm8610"

parents 3fdf557d cfee1187

arch/arm/configs/msm8610-perf_defconfig

+0 −5

Original line number	Diff line number	Diff line
		@@ -62,11 +62,6 @@ CONFIG_MSM_WATCHDOG_V2=y
		CONFIG_MSM_MEMORY_DUMP=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_MSM_ADSP_LOADER=y
		CONFIG_MSM_OCMEM=y
		CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y
		CONFIG_MSM_OCMEM_DEBUG=y
		CONFIG_MSM_OCMEM_NONSECURE=y
		CONFIG_MSM_OCMEM_POWER_DISABLE=y
		CONFIG_SENSORS_ADSP=y
		CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y
		CONFIG_MSM_BOOT_STATS=y

arch/arm/configs/msm8610_defconfig

+0 −5

Original line number	Diff line number	Diff line
		@@ -59,11 +59,6 @@ CONFIG_MSM_WATCHDOG_V2=y
		CONFIG_MSM_MEMORY_DUMP=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_MSM_ADSP_LOADER=y
		CONFIG_MSM_OCMEM=y
		CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y
		CONFIG_MSM_OCMEM_DEBUG=y
		CONFIG_MSM_OCMEM_NONSECURE=y
		CONFIG_MSM_OCMEM_POWER_DISABLE=y
		CONFIG_SENSORS_ADSP=y
		CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y
		CONFIG_MSM_BOOT_STATS=y