diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-26 19:37:53 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-26 19:37:53 -0500 |
| commit | af261127e94c286c08bba162711307863fd4e68c (patch) | |
| tree | d6dda7ab34c353a5d42653531b99fc30dd41721e /kernel/power | |
| parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) | |
| parent | b2b49ccbdd547135c69371ed066cffa44912060a (diff) | |
Merge back earlier 'pm-runtime' material for 3.19-rc1.
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index bbef57f5bdfd..95d712e3677d 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 |