git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2416
/
s3c2416.c
diff --git
a/arch/arm/mach-s3c2416/s3c2416.c
b/arch/arm/mach-s3c2416/s3c2416.c
index
3156b7a
..
7dbee81
100644
(file)
--- a/
arch/arm/mach-s3c2416/s3c2416.c
+++ b/
arch/arm/mach-s3c2416/s3c2416.c
@@
-97,7
+97,9
@@
int __init s3c2416_init(void)
s3c_fb_setname("s3c2443-fb");
+#ifdef CONFIG_PM
register_syscore_ops(&s3c2416_pm_syscore_ops);
+#endif
register_syscore_ops(&s3c24xx_irq_syscore_ops);
return sysdev_register(&s3c2416_sysdev);