diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-19 15:46:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-19 15:46:29 -0700 |
| commit | 516fb7a22a5347dc6db731369c365ed1f9b64632 (patch) | |
| tree | 733d7c478de6df42761a2938b6129d6242bb84fd /arch/arm/mach-s3c24xx/s3c2416.c | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
| parent | 60e49ca654eea42e04912b259fa36bad2c3e56ef (diff) | |
Merge branch 'next/devel-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into late/soc
* 'next/devel-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
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
+ dependent branches
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2416.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c2416.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c index 7743fade50d..ed5a95ece9e 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); } |