summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/s3c2440.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-02-26 21:50:22 +0100
committerKukjin Kim <kgene@kernel.org>2015-02-26 21:50:22 +0100
commit4f506daf0e6c094d2f28253d4044e9adc9461142 (patch)
treeae16b7f261fefeb3e2022469e74715bea0da6557 /arch/arm/mach-s3c24xx/s3c2440.c
parentARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416 (diff)
downloadlinux-4f506daf0e6c094d2f28253d4044e9adc9461142.tar.xz
linux-4f506daf0e6c094d2f28253d4044e9adc9461142.zip
ARM: S3C24XX: fix building without PM_SLEEP
We get lots of link errors based on the assumption that any s3c24xx kernel would enable CONFIG_PM_SLEEP if it enables CONFIG_PM. This tries to clean that up. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kukjin Kim <kgene@kernel.org>
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2440.c')
-rw-r--r--arch/arm/mach-s3c24xx/s3c2440.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2440.c b/arch/arm/mach-s3c24xx/s3c2440.c
index 03d379f1fc52..eb733555fab5 100644
--- a/arch/arm/mach-s3c24xx/s3c2440.c
+++ b/arch/arm/mach-s3c24xx/s3c2440.c
@@ -57,11 +57,11 @@ int __init s3c2440_init(void)
/* register suspend/resume handlers */
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
register_syscore_ops(&s3c2410_pm_syscore_ops);
register_syscore_ops(&s3c24xx_irq_syscore_ops);
-#endif
register_syscore_ops(&s3c244x_pm_syscore_ops);
+#endif
/* register our system device for everything else */