diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 15:59:09 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 15:59:09 -0400 |
| commit | b8bc83971cc20cae3c3b65c26a804f350d74960c (patch) | |
| tree | 2573e6367e1806c298344fa023bb49a16cc4d1e4 /arch/arm/mach-s3c2410 | |
| parent | 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (diff) | |
| parent | bca7ab316edd819edd0e3d59f9ccb26c6b2173f5 (diff) | |
Merge branch 'pxa/devel' into next/devel2
Conflicts:
arch/arm/mach-s3c2416/s3c2416.c
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/s3c2410.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c index a99c2f4a523f..3d7ebc557a72 100644 --- a/arch/arm/mach-s3c2410/s3c2410.c +++ b/arch/arm/mach-s3c2410/s3c2410.c | |||
| @@ -170,7 +170,9 @@ int __init s3c2410_init(void) | |||
| 170 | { | 170 | { |
| 171 | printk("S3C2410: Initialising architecture\n"); | 171 | printk("S3C2410: Initialising architecture\n"); |
| 172 | 172 | ||
| 173 | #ifdef CONFIG_PM | ||
| 173 | register_syscore_ops(&s3c2410_pm_syscore_ops); | 174 | register_syscore_ops(&s3c2410_pm_syscore_ops); |
| 175 | #endif | ||
| 174 | register_syscore_ops(&s3c24xx_irq_syscore_ops); | 176 | register_syscore_ops(&s3c24xx_irq_syscore_ops); |
| 175 | 177 | ||
| 176 | return sysdev_register(&s3c2410_sysdev); | 178 | return sysdev_register(&s3c2410_sysdev); |