aboutsummaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-13 11:39:36 +0000
committerMark Brown <broonie@kernel.org>2014-12-13 11:39:36 +0000
commit3e5fe00cd38e033796a0de2ea9928c0cb460e6b6 (patch)
tree0996fa20df211dd113519735846c8555d74d3d03 /kernel/power
parent32a13f39f539963aee2c0b08f4da973db192a2ff (diff)
parent6920cae74d18abc2e1a2fda0970f8e9889ef3b7d (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/genpd' into linux-linaro-lsklsk-v3.10-14.12
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 46455961a88f..52423b5d7ae9 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -291,6 +291,10 @@ config PM_GENERIC_DOMAINS_RUNTIME
def_bool y
depends on PM_RUNTIME && PM_GENERIC_DOMAINS
+config PM_GENERIC_DOMAINS_OF
+ def_bool y
+ depends on PM_GENERIC_DOMAINS && OF && !ARCH_EXYNOS
+
config CPU_PM
bool
depends on SUSPEND || CPU_IDLE