commit af6857a2f079f04c8bebef2b2f723e53a4c0149f
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 20 15:29:58 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 20 15:29:58 2013 -0800
tree 28a21f8326e7cfce32a60bac6d6e6c94f0e48383
parent 79ba7f38fdda05286c9689e2c64451ae7a3fecc8
parent 19656d72d38d2eb1fd8dbb415135ad55973d1a18

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 aafd175..e25a6e2 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 fa520b7..0b957c7 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