diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-02-26 21:50:22 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene@kernel.org> | 2015-02-26 21:50:22 +0100 |
| commit | 4f506daf0e6c094d2f28253d4044e9adc9461142 (patch) | |
| tree | ae16b7f261fefeb3e2022469e74715bea0da6557 /arch/arm/mach-s3c24xx/s3c244x.c | |
| parent | ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416 (diff) | |
| download | linux-4f506daf0e6c094d2f28253d4044e9adc9461142.tar.xz linux-4f506daf0e6c094d2f28253d4044e9adc9461142.zip | |
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/s3c244x.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c244x.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c index 177f97802745..b14119585dc7 100644 --- a/arch/arm/mach-s3c24xx/s3c244x.c +++ b/arch/arm/mach-s3c24xx/s3c244x.c @@ -108,7 +108,7 @@ static int __init s3c2442_core_init(void) core_initcall(s3c2442_core_init); -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static struct sleep_save s3c244x_sleep[] = { SAVE_ITEM(S3C2440_DSC0), SAVE_ITEM(S3C2440_DSC1), @@ -127,12 +127,9 @@ static void s3c244x_resume(void) { s3c_pm_do_restore(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); } -#else -#define s3c244x_suspend NULL -#define s3c244x_resume NULL -#endif struct syscore_ops s3c244x_pm_syscore_ops = { .suspend = s3c244x_suspend, .resume = s3c244x_resume, }; +#endif |