diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:01 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:01 -0400 |
| commit | 552a79413a691a09abf1b3707561858422afc53c (patch) | |
| tree | e38e1a15cf25fcb240414237209d3fc5a28944d4 /arch/arm/mach-s3c2440 | |
| parent | d30d9cf39c522f3aa767015e5b6d3d18b4414137 (diff) | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
Merge commit 'v3.1' into linaro-3.1
Diffstat (limited to 'arch/arm/mach-s3c2440')
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c2440.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/s3c2442.c | 2 |
2 files changed, 4 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); diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c index 9ad99f8016a..6f2b65e6e06 100644 --- a/arch/arm/mach-s3c2440/s3c2442.c +++ b/arch/arm/mach-s3c2440/s3c2442.c @@ -169,7 +169,9 @@ int __init s3c2442_init(void) { printk("S3C2442: Initialising architecture\n"); +#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); |