diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-23 10:44:40 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-23 10:44:40 +0300 |
commit | 1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49 (patch) | |
tree | 3628287c740b7150f2808b89b4305a811778acab /arch/arm/mach-s3c2440/s3c2440.c | |
parent | 5117cc25fd43add94c04c9d2ace713c69a21bdb1 (diff) | |
parent | fb630b9fc902e24209166b1659a8b375bf38099c (diff) |
Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung
* 'samsung-fixes-4' of git://github.com/kgene/linux-samsung:
ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM
ARM: S5P: fix offset calculation on gpio-interrupt
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c2440.c')
-rw-r--r-- | arch/arm/mach-s3c2440/s3c2440.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c index ce99ff72838..2270d336021 100644 --- a/arch/arm/mach-s3c2440/s3c2440.c +++ b/arch/arm/mach-s3c2440/s3c2440.c @@ -55,7 +55,9 @@ int __init s3c2440_init(void) /* register suspend/resume handlers */ +#ifdef CONFIG_PM register_syscore_ops(&s3c2410_pm_syscore_ops); +#endif register_syscore_ops(&s3c244x_pm_syscore_ops); register_syscore_ops(&s3c24xx_irq_syscore_ops); |