PM / Kconfig: Do not select PM directly from Kconfig files

It is not valid to select CONFIG_PM directly without selecting
CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME too, because that breaks
dependencies (ia64 does that) and it is not necessary to select
CONFIG_PM directly if CONFIG_PM_SLEEP or CONFIG_PM_RUNTIME is
selected, because CONFIG_PM will be set automatically in that
case (sh does that).

Fix those mistakes.

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 55bc92ca2ce65e79eebf333c8dd1536d29308f3a..536d13b0bea69d7dc1465ce6c5d75766ef4cefa9 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -11,7 +11,6 @@ config IA64
        select PCI if (!IA64_HP_SIM)
        select ACPI if (!IA64_HP_SIM)
        select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
-       select PM if (!IA64_HP_SIM)
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 244fb4c81e2525d0cbc62dceab964722bff5b5c5..a1403470f80e69b5e05de75ae3a8f0058e9414ab 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -222,7 +222,6 @@ config CPU_SHX3
 config ARCH_SHMOBILE
        bool
        select ARCH_SUSPEND_POSSIBLE
-       select PM
        select PM_RUNTIME
 
 config CPU_HAS_PMU