diff options
Diffstat (limited to 'kernel/power/Kconfig')
-rw-r--r-- | kernel/power/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index bbef57f5bdfd..6e7708c2c21f 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
@@ -94,6 +94,7 @@ config PM_STD_PARTITION | |||
94 | config PM_SLEEP | 94 | config PM_SLEEP |
95 | def_bool y | 95 | def_bool y |
96 | depends on SUSPEND || HIBERNATE_CALLBACKS | 96 | depends on SUSPEND || HIBERNATE_CALLBACKS |
97 | select PM_RUNTIME | ||
97 | 98 | ||
98 | config PM_SLEEP_SMP | 99 | config PM_SLEEP_SMP |
99 | def_bool y | 100 | def_bool y |
@@ -131,7 +132,6 @@ config PM_WAKELOCKS_GC | |||
131 | 132 | ||
132 | config PM_RUNTIME | 133 | config PM_RUNTIME |
133 | bool "Run-time PM core functionality" | 134 | bool "Run-time PM core functionality" |
134 | depends on !IA64_HP_SIM | ||
135 | ---help--- | 135 | ---help--- |
136 | Enable functionality allowing I/O devices to be put into energy-saving | 136 | Enable functionality allowing I/O devices to be put into energy-saving |
137 | (low power) states at run time (or autosuspended) after a specified | 137 | (low power) states at run time (or autosuspended) after a specified |
@@ -298,14 +298,9 @@ config PM_GENERIC_DOMAINS_SLEEP | |||
298 | def_bool y | 298 | def_bool y |
299 | depends on PM_SLEEP && PM_GENERIC_DOMAINS | 299 | depends on PM_SLEEP && PM_GENERIC_DOMAINS |
300 | 300 | ||
301 | config PM_GENERIC_DOMAINS_RUNTIME | ||
302 | def_bool y | ||
303 | depends on PM_RUNTIME && PM_GENERIC_DOMAINS | ||
304 | |||
305 | config PM_GENERIC_DOMAINS_OF | 301 | config PM_GENERIC_DOMAINS_OF |
306 | def_bool y | 302 | def_bool y |
307 | depends on PM_GENERIC_DOMAINS && OF | 303 | depends on PM_GENERIC_DOMAINS && OF |
308 | 304 | ||
309 | config CPU_PM | 305 | config CPU_PM |
310 | bool | 306 | bool |
311 | depends on SUSPEND || CPU_IDLE | ||