diff options
| -rw-r--r-- | arch/arm/mach-exynos/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/pm.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 1947be8e5f5b..8dd19c696a60 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
| @@ -647,6 +647,8 @@ void __init exynos5_init_irq(void) | |||
| 647 | * uses GIC instead of VIC. | 647 | * uses GIC instead of VIC. |
| 648 | */ | 648 | */ |
| 649 | s5p_init_irq(NULL, 0); | 649 | s5p_init_irq(NULL, 0); |
| 650 | |||
| 651 | gic_arch_extn.irq_set_wake = s3c_irq_wake; | ||
| 650 | } | 652 | } |
| 651 | 653 | ||
| 652 | struct bus_type exynos_subsys = { | 654 | struct bus_type exynos_subsys = { |
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h index 61fc53740fbd..887a0c954379 100644 --- a/arch/arm/plat-samsung/include/plat/pm.h +++ b/arch/arm/plat-samsung/include/plat/pm.h | |||
| @@ -107,10 +107,12 @@ extern void s3c_pm_do_restore(struct sleep_save *ptr, int count); | |||
| 107 | extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count); | 107 | extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count); |
| 108 | 108 | ||
| 109 | #ifdef CONFIG_PM | 109 | #ifdef CONFIG_PM |
| 110 | extern int s3c_irq_wake(struct irq_data *data, unsigned int state); | ||
| 110 | extern int s3c_irqext_wake(struct irq_data *data, unsigned int state); | 111 | extern int s3c_irqext_wake(struct irq_data *data, unsigned int state); |
| 111 | extern int s3c24xx_irq_suspend(void); | 112 | extern int s3c24xx_irq_suspend(void); |
| 112 | extern void s3c24xx_irq_resume(void); | 113 | extern void s3c24xx_irq_resume(void); |
| 113 | #else | 114 | #else |
| 115 | #define s3c_irq_wake NULL | ||
| 114 | #define s3c_irqext_wake NULL | 116 | #define s3c_irqext_wake NULL |
| 115 | #define s3c24xx_irq_suspend NULL | 117 | #define s3c24xx_irq_suspend NULL |
| 116 | #define s3c24xx_irq_resume NULL | 118 | #define s3c24xx_irq_resume NULL |
