commit 1a8a19ac648074dc997cc1a35a733d36968f2f25
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 02 04:34:28 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 02 04:34:27 2014 -0700
tree 860d4562af3ea37d26509130386c858eea51cb43
parent 5bfbd83ff806eaffb882bbda14229738789c140c
parent e716235526993ff9cffd7d91eddac1858eebb498

Merge "defconfig: msm8226: enable deferred resume"

arch/arm/configs/msm8226-perf_defconfig

diff --git a/arch/arm/configs/msm8226-perf_defconfig b/arch/arm/configs/msm8226-perf_defconfig
index b0f52b2..ef7a5db 100644
--- a/arch/arm/configs/msm8226-perf_defconfig
+++ b/arch/arm/configs/msm8226-perf_defconfig
@@ -396,6 +396,7 @@
 CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_TEST=m
+CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
 CONFIG_MMC_BLOCK_TEST=m
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y

arch/arm/configs/msm8226_defconfig

diff --git a/arch/arm/configs/msm8226_defconfig b/arch/arm/configs/msm8226_defconfig
index 1bd1e2d..d7719eb 100644
--- a/arch/arm/configs/msm8226_defconfig
+++ b/arch/arm/configs/msm8226_defconfig
@@ -421,6 +421,7 @@
 CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_TEST=m
+CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
 CONFIG_MMC_BLOCK_TEST=m
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y