summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-27 01:37:53 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-27 01:37:53 +0100
commitaf261127e94c286c08bba162711307863fd4e68c (patch)
treed6dda7ab34c353a5d42653531b99fc30dd41721e /kernel/power
parentLinux 3.18-rc6 (diff)
parentPM: Kconfig: Set PM_RUNTIME if PM_SLEEP is selected (diff)
downloadlinux-af261127e94c286c08bba162711307863fd4e68c.tar.xz
linux-af261127e94c286c08bba162711307863fd4e68c.zip
Merge back earlier 'pm-runtime' material for 3.19-rc1.
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Kconfig2
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
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