diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-11 00:58:19 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-11 00:58:19 +0200 |
| commit | a01e7b3258bea93fbf1f028fab1c739d80c61823 (patch) | |
| tree | f78d0d13faa406524a58d9ce64756ffdabb64400 /arch/arm/mach-zynq/common.c | |
| parent | Merge branch 'irqchip/stacked-exynos' into irqchip/core (diff) | |
| parent | ARM: zynq: switch from gic_arch_extn to gic_set_irqchip_flags (diff) | |
| download | linux-a01e7b3258bea93fbf1f028fab1c739d80c61823.tar.xz linux-a01e7b3258bea93fbf1f028fab1c739d80c61823.zip | |
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
Conflicts:
drivers/irqchip/irq-gic.c
Diffstat (limited to 'arch/arm/mach-zynq/common.c')
| -rw-r--r-- | arch/arm/mach-zynq/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index c887196cfdbe..58ef2a700414 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -186,7 +186,7 @@ static void __init zynq_map_io(void) static void __init zynq_irq_init(void) { - gic_arch_extn.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND; + gic_set_irqchip_flags(IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND); irqchip_init(); } |