commit df837170c95eedadf600f3954e1d9f20f17324b9
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 21 23:18:58 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 21 23:18:57 2013 -0800
tree 797e4237a50a8b1ecad93b95a7638b436e8be04d
parent c1d35d3da001a68cbfcfe84033d3dcd93426c4f0
parent 3ebaab81d9d8a866b0eb0c223a16e9de16096836

Merge "defconfig: msm: Disable HIGHMEM for msm8610"

arch/arm/configs/msm8610-perf_defconfig

diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig
index 075cca3..8d8f77a 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -79,7 +79,6 @@
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_COMPACTION=y
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_ENABLE_VMALLOC_SAVING=y

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index a5b5a2c..8f7a3bf 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -80,7 +80,6 @@
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_COMPACTION=y
 CONFIG_CC_STACKPROTECTOR=y
 CONFIG_ENABLE_VMALLOC_SAVING=y