Merge branch 'pm-runtime'

[linux-2.6-block.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 1eb7da7bc8e84f24ce137cc3b6eb58ee6aaa5e56..6e7708c2c21f9c7a4e3142a8100bf0aa3852a264 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -94,6 +94,7 @@ config PM_STD_PARTITION
 config PM_SLEEP
        def_bool y
        depends on SUSPEND || HIBERNATE_CALLBACKS
+       select PM_RUNTIME
 
 config PM_SLEEP_SMP
        def_bool y
@@ -131,7 +132,6 @@ config PM_WAKELOCKS_GC
 
 config PM_RUNTIME
        bool "Run-time PM core functionality"
-       depends on !IA64_HP_SIM
        ---help---
          Enable functionality allowing I/O devices to be put into energy-saving
          (low power) states at run time (or autosuspended) after a specified
@@ -298,10 +298,6 @@ config PM_GENERIC_DOMAINS_SLEEP
        def_bool y
        depends on PM_SLEEP && PM_GENERIC_DOMAINS
 
-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