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>

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index c84c88bbbbd79abd66d7cd919bdd7507b0c26b07..55bc92ca2ce65e79eebf333c8dd1536d29308f3a 100644 (file)
--- 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 bbef57f5bdfdbc1764f015e2cafe3ec38ce79f0b..3d39cc0228e9775228254563a8882874e5b2bd98 100644 (file)
--- 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