ARM: arm-soc: Merge branch 'next/pm2' into next/pm

[~shefty/rdma-dev.git] / arch / arm / mach-exynos / common.c

diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 4e1dd8d1eda82de12235984a0dcbe95bea6148d0..454bc6ed9a8d64fbb0a18990273abbff88a0ddb4 100644 (file)
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -615,6 +615,8 @@ void __init exynos5_init_irq(void)
         * uses GIC instead of VIC.
         */
        s5p_init_irq(NULL, 0);
         * uses GIC instead of VIC.
         */
        s5p_init_irq(NULL, 0);

+
+       gic_arch_extn.irq_set_wake = s3c_irq_wake;

 }
 
 struct bus_type exynos_subsys = {
 }
 
 struct bus_type exynos_subsys = {