summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-11-13 23:28:20 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-15 00:39:56 +0100
commit977d2fa6b2ace7e22302a55cdc5ee6110907a9d8 (patch)
tree68538f25904c1462b5708c8008bde16100ab2238 /kernel/power
parentPM / Runtime: Rework RPM get callback routines (diff)
downloadlinux-977d2fa6b2ace7e22302a55cdc5ee6110907a9d8.tar.xz
linux-977d2fa6b2ace7e22302a55cdc5ee6110907a9d8.zip
PM / Runtime: Kconfig: move ia64 dependency to arch/ia64/Kconfig
The IA64_HP_SIM dependency on PM_RUNTIME should be done in the arch Kconfig instead of in the PM core. Move it accordingly. NOTE: arch/ia64/Kconfig currently does a 'select PM', which since commit 1eb208aea317 (PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)) is effectively a noop unless PM_SLEEP or PM_RUNTIME are set elsewhere. Signed-off-by: Kevin Hilman <khilman@linaro.org> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index bbef57f5bdfd..3d39cc0228e9 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -131,7 +131,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