Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core

Conflicts:
	drivers/irqchip/irq-gic.c
This commit is contained in:
Jason Cooper
2015-04-10 22:58:19 +00:00
6 changed files with 10 additions and 14 deletions

View File

@@ -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)