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/plat-samsung | |
| parent | ea8d33ad32f9670fe55c99478e666805efc6452b (diff) | |
| download | linux-4f506daf0e6c094d2f28253d4044e9adc9461142.tar.bz2 | |
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/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/pm.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h index e5a046dc22f5..7f415ce74591 100644 --- a/arch/arm/plat-samsung/include/plat/pm.h +++ b/arch/arm/plat-samsung/include/plat/pm.h @@ -43,7 +43,11 @@ extern unsigned long s3c_irqwake_eintmask; /* IRQ masks for IRQs allowed to go to sleep (see irq.c) */ extern unsigned long s3c_irqwake_intallow; +#ifdef CONFIG_PM_SLEEP extern unsigned long s3c_irqwake_eintallow; +#else +#define s3c_irqwake_eintallow 0 +#endif /* per-cpu sleep functions */ @@ -60,14 +64,18 @@ extern int s3c2410_cpu_suspend(unsigned long); #ifdef CONFIG_PM_SLEEP extern int s3c_irq_wake(struct irq_data *data, unsigned int state); -extern int s3c_irqext_wake(struct irq_data *data, unsigned int state); extern void s3c_cpu_resume(void); #else #define s3c_irq_wake NULL -#define s3c_irqext_wake NULL #define s3c_cpu_resume NULL #endif +#ifdef CONFIG_SAMSUNG_PM +extern int s3c_irqext_wake(struct irq_data *data, unsigned int state); +#else +#define s3c_irqext_wake NULL +#endif + #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK /** * s3c_pm_debug_smdkled() - Debug PM suspend/resume via SMDK Board LEDs |