aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-02-26 15:50:22 -0500
committerKukjin Kim <kgene@kernel.org>2015-02-26 15:50:22 -0500
commit4f506daf0e6c094d2f28253d4044e9adc9461142 (patch)
treeae16b7f261fefeb3e2022469e74715bea0da6557 /arch/arm/plat-samsung/include
parentea8d33ad32f9670fe55c99478e666805efc6452b (diff)
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/include')
-rw-r--r--arch/arm/plat-samsung/include/plat/pm.h12
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;
43 43
44/* IRQ masks for IRQs allowed to go to sleep (see irq.c) */ 44/* IRQ masks for IRQs allowed to go to sleep (see irq.c) */
45extern unsigned long s3c_irqwake_intallow; 45extern unsigned long s3c_irqwake_intallow;
46#ifdef CONFIG_PM_SLEEP
46extern unsigned long s3c_irqwake_eintallow; 47extern unsigned long s3c_irqwake_eintallow;
48#else
49#define s3c_irqwake_eintallow 0
50#endif
47 51
48/* per-cpu sleep functions */ 52/* per-cpu sleep functions */
49 53
@@ -60,14 +64,18 @@ extern int s3c2410_cpu_suspend(unsigned long);
60 64
61#ifdef CONFIG_PM_SLEEP 65#ifdef CONFIG_PM_SLEEP
62extern int s3c_irq_wake(struct irq_data *data, unsigned int state); 66extern int s3c_irq_wake(struct irq_data *data, unsigned int state);
63extern int s3c_irqext_wake(struct irq_data *data, unsigned int state);
64extern void s3c_cpu_resume(void); 67extern void s3c_cpu_resume(void);
65#else 68#else
66#define s3c_irq_wake NULL 69#define s3c_irq_wake NULL
67#define s3c_irqext_wake NULL
68#define s3c_cpu_resume NULL 70#define s3c_cpu_resume NULL
69#endif 71#endif
70 72
73#ifdef CONFIG_SAMSUNG_PM
74extern int s3c_irqext_wake(struct irq_data *data, unsigned int state);
75#else
76#define s3c_irqext_wake NULL
77#endif
78
71#ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK 79#ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
72/** 80/**
73 * s3c_pm_debug_smdkled() - Debug PM suspend/resume via SMDK Board LEDs 81 * s3c_pm_debug_smdkled() - Debug PM suspend/resume via SMDK Board LEDs