commit ed1e2dd6d8a948df8fbc182a1171fbf159b92239
author Linux Build Service Account <lnxbuild@localhost> Fri Feb 10 06:34:33 2012 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Fri Feb 10 06:34:33 2012 -0800
tree 481d94248dd0e7d44743f0ff6e8d88adedf5f225
parent f7acd5332927bc29e0c2cc764498211aafed9554
parent 991b2f58fb90d47bad2f5e5428f209d669fb1990

Merge "msm: msm7627a_defconfig: Enable HIGHMEM support" into msm-3.0

arch/arm/configs/msm7627a-perf_defconfig

diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig
index 76ff09c..3c87f8d 100644
--- a/arch/arm/configs/msm7627a-perf_defconfig
+++ b/arch/arm/configs/msm7627a-perf_defconfig
@@ -54,6 +54,7 @@
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
+CONFIG_HIGHMEM=y
 CONFIG_CP_ACCESS=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0

arch/arm/configs/msm7627a_defconfig

diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig
index 3ddb0c9..cc33b8f 100644
--- a/arch/arm/configs/msm7627a_defconfig
+++ b/arch/arm/configs/msm7627a_defconfig
@@ -54,6 +54,7 @@
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
+CONFIG_HIGHMEM=y
 CONFIG_CP_ACCESS=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0