| commit | a714c1dd54f33b2d682a6da12d191268bf435e4c | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Fri Dec 12 02:03:00 2014 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Fri Dec 12 02:03:00 2014 -0800 |
| tree | 7cdb8b3478ce1fd09b97a67bee8e27ae3dd1e9fb | |
| parent | 512138ba80ba4ca828884c2607ad7e068314183f [diff] | |
| parent | 72481074b6f612ead416c9122c999acb231601ea [diff] |
Merge "defconfig: msm8x10: Enabling highmem"
diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig index 55bc185..a521cbc 100644 --- a/arch/arm/configs/msm8610-perf_defconfig +++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -74,6 +74,7 @@ CONFIG_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y CONFIG_AEABI=y +CONFIG_HIGHMEM=y CONFIG_COMPACTION=y CONFIG_KSM=y CONFIG_CC_STACKPROTECTOR=y
diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig index b239bcb..1f7fcbd 100644 --- a/arch/arm/configs/msm8610_defconfig +++ b/arch/arm/configs/msm8610_defconfig
@@ -75,6 +75,7 @@ CONFIG_ARM_ARCH_TIMER=y CONFIG_PREEMPT=y CONFIG_AEABI=y +CONFIG_HIGHMEM=y CONFIG_COMPACTION=y CONFIG_KSM=y CONFIG_CC_STACKPROTECTOR=y