aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/Kconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-11-29 23:16:34 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-04 00:50:53 +0100
commita1518d3bbc15d89ccf33056ffa8b3a63de118d24 (patch)
tree8e6bcc533a66c71988e960c676d1f321c285f266 /arch/sh/Kconfig
parentPCI / PM: Drop CONFIG_PM_RUNTIME from the PCI core (diff)
downloadlinux-dev-a1518d3bbc15d89ccf33056ffa8b3a63de118d24.tar.xz
linux-dev-a1518d3bbc15d89ccf33056ffa8b3a63de118d24.zip
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>
Diffstat (limited to '')
-rw-r--r--arch/sh/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 244fb4c81e25..a1403470f80e 100644
--- 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