summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2416
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-30 20:59:09 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-30 20:59:09 +0100
commitb8bc83971cc20cae3c3b65c26a804f350d74960c (patch)
tree2573e6367e1806c298344fa023bb49a16cc4d1e4 /arch/arm/mach-s3c2416
parent11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (diff)
parentbca7ab316edd819edd0e3d59f9ccb26c6b2173f5 (diff)
downloadblackbird-op-linux-b8bc83971cc20cae3c3b65c26a804f350d74960c.tar.gz
blackbird-op-linux-b8bc83971cc20cae3c3b65c26a804f350d74960c.zip
Merge branch 'pxa/devel' into next/devel2
Conflicts: arch/arm/mach-s3c2416/s3c2416.c
Diffstat (limited to 'arch/arm/mach-s3c2416')
-rw-r--r--arch/arm/mach-s3c2416/s3c2416.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c
index 081ef4cb8688..ee214bc83c83 100644
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@ -100,7 +100,9 @@ int __init s3c2416_init(void)
s3c_adc_setname("s3c2416-adc");
+#ifdef CONFIG_PM
register_syscore_ops(&s3c2416_pm_syscore_ops);
+#endif
register_syscore_ops(&s3c24xx_irq_syscore_ops);
return sysdev_register(&s3c2416_sysdev);
OpenPOWER on IntegriCloud