aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2011-12-05 10:23:20 +0530
committerTushar Behera <tushar.behera@linaro.org>2011-12-05 11:15:31 +0530
commit48906b0ea41e7c451816ffcfa498cebaa43f82c9 (patch)
treefc765a26dc4c40e8ab84635346bf95f9b3416c68
parente1b77aa6c846e82af8fb03e6526c6343668333b9 (diff)
Revert "CONFIG: ORIGEN: Disable PM_RUNTIME temporarily"samsung-lt-v3.2-rc4-1
This reverts commit 8f6991ebcb1a4c3f71d18f2946b90ad81b2d784f. With a fix for pm_runtime unbalance for dma applied, we can enable PM_RUNTIME now. Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--arch/arm/configs/origen_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/origen_defconfig b/arch/arm/configs/origen_defconfig
index 705b8663597..d6255c9ab27 100644
--- a/arch/arm/configs/origen_defconfig
+++ b/arch/arm/configs/origen_defconfig
@@ -28,6 +28,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_IDLE=y
CONFIG_VFP=y
CONFIG_NEON=y
+CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_INET=y
CONFIG_IP_PNP=y