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

Commit 9aa5a769 authored Jan 19, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jan 19, 2016

Merge "defconfig: arm: msm: Configure common CMA size to 16MB"

parents d171201f 4a8bd54e

arch/arm/configs/msmcortex-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,6 @@ CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=8
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y

arch/arm/configs/msmcortex_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,6 @@ CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=8
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_QSEECOM=y

arch/arm64/configs/msmcortex-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,6 @@ CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=8
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y

arch/arm64/configs/msmcortex_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,6 @@ CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_DMA_CMA=y
		CONFIG_CMA_SIZE_MBYTES=8
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y