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/pm.c | |
| parent | ea8d33ad32f9670fe55c99478e666805efc6452b (diff) | |
| download | lwn-4f506daf0e6c094d2f28253d4044e9adc9461142.tar.gz lwn-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/pm.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/pm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/pm.c b/arch/arm/mach-s3c24xx/pm.c index b19256ec8d40..5d510bca0844 100644 --- a/arch/arm/mach-s3c24xx/pm.c +++ b/arch/arm/mach-s3c24xx/pm.c @@ -50,6 +50,7 @@ #define PFX "s3c24xx-pm: " +#ifdef CONFIG_PM_SLEEP static struct sleep_save core_save[] = { /* we restore the timings here, with the proviso that the board * brings the system up in an slower, or equal frequency setting @@ -67,6 +68,7 @@ static struct sleep_save core_save[] = { SAVE_ITEM(S3C2410_BANKCON4), SAVE_ITEM(S3C2410_BANKCON5), }; +#endif /* s3c_pm_check_resume_pin * @@ -121,7 +123,7 @@ void s3c_pm_configure_extint(void) } } - +#ifdef CONFIG_PM_SLEEP void s3c_pm_restore_core(void) { s3c_pm_do_restore_core(core_save, ARRAY_SIZE(core_save)); @@ -131,4 +133,4 @@ void s3c_pm_save_core(void) { s3c_pm_do_save(core_save, ARRAY_SIZE(core_save)); } - +#endif |