Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index cedd9982306a227e5ef6f6d3e88e3f0352ca207f..deb5461e3216905bc6b626da168bc98321e7b21f 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -239,3 +239,7 @@ config PM_GENERIC_DOMAINS
 config PM_GENERIC_DOMAINS_RUNTIME
        def_bool y
        depends on PM_RUNTIME && PM_GENERIC_DOMAINS
+
+config CPU_PM
+       bool
+       depends on SUSPEND || CPU_IDLE