aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power/Kconfig
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-11-13 17:28:20 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-14 18:39:56 -0500
commit977d2fa6b2ace7e22302a55cdc5ee6110907a9d8 (patch)
tree68538f25904c1462b5708c8008bde16100ab2238 /kernel/power/Kconfig
parentdbcd2d7253009977d52d6c1cf50e0a2452dee4a8 (diff)
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/Kconfig')
-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
131 131
132config PM_RUNTIME 132config PM_RUNTIME
133 bool "Run-time PM core functionality" 133 bool "Run-time PM core functionality"
134 depends on !IA64_HP_SIM
135 ---help--- 134 ---help---
136 Enable functionality allowing I/O devices to be put into energy-saving 135 Enable functionality allowing I/O devices to be put into energy-saving
137 (low power) states at run time (or autosuspended) after a specified 136 (low power) states at run time (or autosuspended) after a specified