summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-11-13 14:28:20 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-15 00:39:56 +0100
commit977d2fa6b2ace7e22302a55cdc5ee6110907a9d8 (patch)
tree68538f25904c1462b5708c8008bde16100ab2238
parentdbcd2d7253009977d52d6c1cf50e0a2452dee4a8 (diff)
downloadop-kernel-dev-977d2fa6b2ace7e22302a55cdc5ee6110907a9d8.zip
op-kernel-dev-977d2fa6b2ace7e22302a55cdc5ee6110907a9d8.tar.gz
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>
-rw-r--r--arch/ia64/Kconfig1
-rw-r--r--kernel/power/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index c84c88b..55bc92c 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -233,6 +233,7 @@ config IA64_SGI_UV
config IA64_HP_SIM
bool "Ski-simulator"
select SWIOTLB
+ depends on !PM_RUNTIME
endchoice
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index bbef57f..3d39cc0 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
OpenPOWER on IntegriCloud