summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx/s3c2416.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-31 03:06:46 +0400
committerOlof Johansson <olof@lixom.net>2012-05-31 03:06:46 +0400
commit929d138a3ba776145d2f421c2c4f16d922535090 (patch)
treecb725266d584eb6a64d4bbc010449bb50ecac247 /arch/arm/mach-s3c24xx/s3c2416.c
parentd64f41d8d2dabf4d10a11f7a5d1ef8706969655f (diff)
parent67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (diff)
downloadlinux-929d138a3ba776145d2f421c2c4f16d922535090.tar.xz
Merge branch 'late/soc' into devel-late
* late/soc: ARM: vexpress: Remove twice included header files ARM: vexpress: Device Tree updates ARM: EXYNOS: Support suspend and resume for EXYNOS5250 ARM: EXYNOS: Add Clock register list for save and restore ARM: EXYNOS: Add PMU table for EXYNOS5250 ARM: EXYNOS: Rename of function for pm.c ARM: EXYNOS: Remove GIC save & restore function ARM: dts: Add node for interrupt combiner controller on EXYNOS5250 ARM: S3C24XX: add support for second irq set of S3C2416
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2416.c')
-rw-r--r--arch/arm/mach-s3c24xx/s3c2416.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c
index 7743fade50df..ed5a95ece9eb 100644
--- a/arch/arm/mach-s3c24xx/s3c2416.c
+++ b/arch/arm/mach-s3c24xx/s3c2416.c
@@ -106,6 +106,7 @@ int __init s3c2416_init(void)
register_syscore_ops(&s3c2416_pm_syscore_ops);
#endif
register_syscore_ops(&s3c24xx_irq_syscore_ops);
+ register_syscore_ops(&s3c2416_irq_syscore_ops);
return device_register(&s3c2416_dev);
}