From 50b247f4732a3b01eee2be93e43a8868889f0a7d Mon Sep 17 00:00:00 2001 From: Inderpal Singh Date: Thu, 22 Nov 2012 14:46:21 +0900 Subject: [PATCH] --- yaml --- r: 342442 b: refs/heads/master c: 3445513ca283ebf55ce2345ef408f28d98884dab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/common.c | 2 ++ trunk/arch/arm/plat-samsung/include/plat/pm.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cedd8434403a..b775746645ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 756e46dbaacf1d6d3cbefcef725e0f969afcb1e5 +refs/heads/master: 3445513ca283ebf55ce2345ef408f28d98884dab diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c index 1947be8e5f5b..8dd19c696a60 100644 --- a/trunk/arch/arm/mach-exynos/common.c +++ b/trunk/arch/arm/mach-exynos/common.c @@ -647,6 +647,8 @@ void __init exynos5_init_irq(void) * uses GIC instead of VIC. */ s5p_init_irq(NULL, 0); + + gic_arch_extn.irq_set_wake = s3c_irq_wake; } struct bus_type exynos_subsys = { diff --git a/trunk/arch/arm/plat-samsung/include/plat/pm.h b/trunk/arch/arm/plat-samsung/include/plat/pm.h index 61fc53740fbd..887a0c954379 100644 --- a/trunk/arch/arm/plat-samsung/include/plat/pm.h +++ b/trunk/arch/arm/plat-samsung/include/plat/pm.h @@ -107,10 +107,12 @@ extern void s3c_pm_do_restore(struct sleep_save *ptr, int count); extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count); #ifdef CONFIG_PM +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 int s3c24xx_irq_suspend(void); extern void s3c24xx_irq_resume(void); #else +#define s3c_irq_wake NULL #define s3c_irqext_wake NULL #define s3c24xx_irq_suspend NULL #define s3c24xx_irq_resume NULL