commit c3a4b89c16f8e0a0311b4d63e6c06248f3817036
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 21 23:19:05 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 21 23:19:04 2013 -0800
tree e44b9ca29ead3596de9d227cf251a4f13b573bcb
parent f2f54ef6a3074c4329c65f207e4b75a5ddf9ba91
parent 0f6ee86228720a47bdd5773a9efe7b0d598163cb

Merge "defconfig: msm: Enable zram 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 8d8f77a..8366a41 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -358,6 +358,8 @@
 CONFIG_UIO=y
 CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_STAGING=y
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index 8f7a3bf..02db2f2 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -382,6 +382,8 @@
 CONFIG_UIO=y
 CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_STAGING=y
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y