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 /drivers/irqchip/irq-gic.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 'drivers/irqchip/irq-gic.c')
| -rw-r--r-- | drivers/irqchip/irq-gic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 868983c6aa5e..61ffbbc92f37 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -880,6 +880,11 @@ static const struct irq_domain_ops gic_irq_domain_ops = { .xlate = gic_irq_domain_xlate, }; +void gic_set_irqchip_flags(unsigned long flags) +{ + gic_chip.flags |= flags; +} + void __init gic_init_bases(unsigned int gic_nr, int irq_start, void __iomem *dist_base, void __iomem *cpu_base, u32 percpu_offset, struct device_node *node) |