diff options
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/pm.h | 4 | ||||
-rw-r--r-- | arch/arm/plat-samsung/pm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h index 0a5b7faca836..f6749916d194 100644 --- a/arch/arm/plat-samsung/include/plat/pm.h +++ b/arch/arm/plat-samsung/include/plat/pm.h | |||
@@ -42,7 +42,7 @@ extern unsigned long s3c_irqwake_eintallow; | |||
42 | /* per-cpu sleep functions */ | 42 | /* per-cpu sleep functions */ |
43 | 43 | ||
44 | extern void (*pm_cpu_prep)(void); | 44 | extern void (*pm_cpu_prep)(void); |
45 | extern void (*pm_cpu_sleep)(unsigned long); | 45 | extern int (*pm_cpu_sleep)(unsigned long); |
46 | 46 | ||
47 | /* Flags for PM Control */ | 47 | /* Flags for PM Control */ |
48 | 48 | ||
@@ -54,7 +54,7 @@ extern unsigned char pm_uart_udivslot; /* true to save UART UDIVSLOT */ | |||
54 | 54 | ||
55 | extern void s3c_cpu_resume(void); | 55 | extern void s3c_cpu_resume(void); |
56 | 56 | ||
57 | extern void s3c2410_cpu_suspend(unsigned long); | 57 | extern int s3c2410_cpu_suspend(unsigned long); |
58 | 58 | ||
59 | /* sleep save info */ | 59 | /* sleep save info */ |
60 | 60 | ||
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index 69d6b040a019..5fa1742d019b 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c | |||
@@ -232,7 +232,7 @@ static void __maybe_unused s3c_pm_show_resume_irqs(int start, | |||
232 | 232 | ||
233 | 233 | ||
234 | void (*pm_cpu_prep)(void); | 234 | void (*pm_cpu_prep)(void); |
235 | void (*pm_cpu_sleep)(unsigned long); | 235 | int (*pm_cpu_sleep)(unsigned long); |
236 | 236 | ||
237 | #define any_allowed(mask, allow) (((mask) & (allow)) != (allow)) | 237 | #define any_allowed(mask, allow) (((mask) & (allow)) != (allow)) |
238 | 238 | ||