diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-27 01:37:53 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-27 01:37:53 +0100 |
| commit | af261127e94c286c08bba162711307863fd4e68c (patch) | |
| tree | d6dda7ab34c353a5d42653531b99fc30dd41721e /kernel/power | |
| parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) | |
| parent | b2b49ccbdd547135c69371ed066cffa44912060a (diff) | |
| download | op-kernel-dev-af261127e94c286c08bba162711307863fd4e68c.zip op-kernel-dev-af261127e94c286c08bba162711307863fd4e68c.tar.gz | |
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 bbef57f..95d712e 100644 --- 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 |
