From: Magnus Damm <damm@igel.co.jp>
Date: Thu, 4 Dec 2008 13:45:12 +0000 (+0900)
Subject: sh: allow CONFIG_PM
X-Git-Tag: v2.6.29-rc1~591^2~74
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af998a9a0ae3291e86ddcae8e196a1cbf82c2457;p=linux-2.6-omap-h63xx.git

sh: allow CONFIG_PM

Allow users to select CONFIG_PM regardless of processor type or board.
Suspend and hibernation are only allowed on supported platforms.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 9d9baeb0784..61284165ea7 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -87,10 +87,17 @@ config GENERIC_LOCKBREAK
 
 config SYS_SUPPORTS_PM
 	bool
+	depends on !SMP
+
+config ARCH_SUSPEND_POSSIBLE
+	def_bool n
+
+config ARCH_HIBERNATION_POSSIBLE
+	def_bool n
 
 config SYS_SUPPORTS_APM_EMULATION
 	bool
-	select SYS_SUPPORTS_PM
+	select ARCH_SUSPEND_POSSIBLE
 
 config SYS_SUPPORTS_SMP
 	bool
@@ -755,11 +762,7 @@ source "fs/Kconfig.binfmt"
 endmenu
 
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL && SYS_SUPPORTS_PM
-
-config ARCH_SUSPEND_POSSIBLE
-	def_bool y
-	depends on !SMP
+depends on EXPERIMENTAL
 
 source kernel/power/Kconfig