aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorDomenico Andreoli <cavokz@gmail.com>2011-10-22 04:00:53 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-10-22 04:00:53 +0900
commitfb630b9fc902e24209166b1659a8b375bf38099c (patch)
tree6212a56b9fd29ab09a9c943b5e0d9ae75b3d3ea0 /arch/arm/mach-s3c2410
parentARM: S5P: fix offset calculation on gpio-interrupt (diff)
downloadlinux-dev-fb630b9fc902e24209166b1659a8b375bf38099c.tar.xz
linux-dev-fb630b9fc902e24209166b1659a8b375bf38099c.zip
ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM
v2: - register_syscore_ops(&s3c24xx_irq_syscore_ops) does not need to be conditionally compiled out, it is already optimized out on !CONFIG_PM - fix also s3c2412 and s3c2416 affected by the same build issue v1: s3c2440.c fails to build if !CONFIG_PM because in such case s3c2410_pm_syscore_ops is not defined. Same error should happen also in s3c2410.c and s3c2442.c Signed-off-by: Domenico Andreoli <cavokz@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/s3c2410.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index f1d3bd8f6f17..343a540d86a9 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -170,7 +170,9 @@ int __init s3c2410_init(void)
{
printk("S3C2410: Initialising architecture\n");
+#ifdef CONFIG_PM
register_syscore_ops(&s3c2410_pm_syscore_ops);
+#endif
register_syscore_ops(&s3c24xx_irq_syscore_ops);
return sysdev_register(&s3c2410_sysdev);