summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-05-16 12:43:55 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-16 12:57:44 +0200
commit5f23188e036aabfe9245f9e61adbb4ea27ed8f35 (patch)
treea4c07f2e4627f0fdc521c5a3611ca82be40fbc44
parentARM: 6870/1: The mandatory barrier rmb() must be a dsb() in for device accesses (diff)
downloadlinux-5f23188e036aabfe9245f9e61adbb4ea27ed8f35.tar.xz
linux-5f23188e036aabfe9245f9e61adbb4ea27ed8f35.zip
ARM: 6900/1: Suspend: Fix build error on ARCH_S5PC100
The current mainline codes of ARCH_S5PC100 cannot support suspend to ram. So needs this for preventing build error. Cc: Russell King <rmk+kernel at arm.linux.org.uk> Signed-off-by: Kukjin Kim <kgene.kim at samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 377a7a595b08..96839d9ee35d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2010,7 +2010,7 @@ menu "Power management options"
source "kernel/power/Kconfig"
config ARCH_SUSPEND_POSSIBLE
- depends on !ARCH_S5P64X0 && !ARCH_S5P6442
+ depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100
depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
def_bool y