commit 2ebc5d3bb44a34facd6a67afd1d225c8817394b8
author Linux Build Service Account <lnxbuild@localhost> Sun Aug 12 23:57:20 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sun Aug 12 23:57:20 2012 -0700
tree a271d24bf3ee888496aecd1d2faea5a689167ace
parent b08cb46c81643d08212311e912693fef15a58c10
parent ac297ca14edb2b4072b1489da2eec8fbc765c073

Merge "defconfig: 8974: Enable OCMEM power debug mode" into msm-3.4

arch/arm/configs/msm8974_defconfig

diff --git a/arch/arm/configs/msm8974_defconfig b/arch/arm/configs/msm8974_defconfig
index b2eef6f..c73c62e 100644
--- a/arch/arm/configs/msm8974_defconfig
+++ b/arch/arm/configs/msm8974_defconfig
@@ -52,6 +52,8 @@
 CONFIG_MSM_DIRECT_SCLK_ACCESS=y
 CONFIG_MSM_OCMEM=y
 CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y
+CONFIG_MSM_OCMEM_DEBUG=y
+CONFIG_MSM_OCMEM_POWER_DISABLE=y
 CONFIG_MSM_MEMORY_DUMP=y
 CONFIG_MSM_CACHE_ERP=y
 CONFIG_MSM_L1_ERR_PANIC=y