summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-10 23:04:06 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-10 23:04:05 -0700
commite1fb82e224e0fa3eda36ba25aed0747cc463ab33 (patch)
tree60c634235a351dd0ac1738198bebd6be40633361 /arch
parent97f9e941545b6b29bb0d8c2691a2437a06bbae5e (diff)
parent89e74ed89899ac57c155b57b57682edd39fc8c48 (diff)
Merge "defconfig: msmcortex: Disable CONFIG_FORCE_ALLOC_FROM_DMA_ZONE"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/configs/msmcortex-perf_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 2fda53fb832b..778dcfecaf1c 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -65,7 +65,6 @@ CONFIG_CMA=y
CONFIG_CMA_DEBUGFS=y
CONFIG_ZSMALLOC=y
CONFIG_BALANCE_ANON_FILE_RECLAIM=y
-CONFIG_FORCE_ALLOC_FROM_DMA_ZONE=y
CONFIG_SECCOMP=y
CONFIG_ARMV8_DEPRECATED=y
CONFIG_SWP_EMULATION=y