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

Commit 9bffceb0 authored Nov 10, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Nov 10, 2015

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

parents c3fc6e9b 05e480e1

arch/arm/configs/msm8937-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,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/msm8937_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,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/msm8937-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,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/msm8937_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,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