diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-13 11:40:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-13 11:40:22 +0000 |
| commit | f891dfcd5fd0a0848ca42311e78eca8bf1d3e45b (patch) | |
| tree | a58be80eaa964310fef20fe87386ef7fe3381763 /kernel/power/Kconfig | |
| parent | 7d8d2b5924c41ee249ee2280d4240d7cbba3fda8 (diff) | |
| parent | 3e5fe00cd38e033796a0de2ea9928c0cb460e6b6 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-android-14.12
Diffstat (limited to 'kernel/power/Kconfig')
| -rw-r--r-- | kernel/power/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 7a297aeeca9e..e97c63994f6b 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -299,6 +299,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 |