diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-02-27 05:50:22 +0900 |
---|---|---|
committer | Kukjin Kim <kgene@kernel.org> | 2015-02-27 05:50:22 +0900 |
commit | 4f506daf0e6c094d2f28253d4044e9adc9461142 (patch) | |
tree | ae16b7f261fefeb3e2022469e74715bea0da6557 /arch/arm/mach-s3c24xx/s3c2442.c | |
parent | ea8d33ad32f9670fe55c99478e666805efc6452b (diff) | |
download | op-kernel-dev-4f506daf0e6c094d2f28253d4044e9adc9461142.zip op-kernel-dev-4f506daf0e6c094d2f28253d4044e9adc9461142.tar.gz |
ARM: S3C24XX: fix building without PM_SLEEP
We get lots of link errors based on the assumption that
any s3c24xx kernel would enable CONFIG_PM_SLEEP if it
enables CONFIG_PM. This tries to clean that up.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Diffstat (limited to 'arch/arm/mach-s3c24xx/s3c2442.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/s3c2442.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2442.c b/arch/arm/mach-s3c24xx/s3c2442.c index 7b04334..893998e 100644 --- a/arch/arm/mach-s3c24xx/s3c2442.c +++ b/arch/arm/mach-s3c24xx/s3c2442.c @@ -60,11 +60,11 @@ int __init s3c2442_init(void) { printk("S3C2442: Initialising architecture\n"); -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP register_syscore_ops(&s3c2410_pm_syscore_ops); register_syscore_ops(&s3c24xx_irq_syscore_ops); -#endif register_syscore_ops(&s3c244x_pm_syscore_ops); +#endif return device_register(&s3c2442_dev); } |