diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-03-21 14:30:54 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-03-21 14:30:54 +0300 |
| commit | 3ce8461f45a7486b286afa2ae5619ce6aed8b6db (patch) | |
| tree | cc445fa3aed0f434bde55320080d8e4969066a5d /include | |
| parent | 551417af91b163bd697eb50b3601adae2177c28a (diff) | |
| parent | fca269f201a8d9985c0a31fb60b15d4eb57cef80 (diff) | |
| download | linux-3ce8461f45a7486b286afa2ae5619ce6aed8b6db.tar.xz | |
Merge tag 'irqchip-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip updates for 5.1 from Marc Zyngier:
- irqsteer error handling fix
- GICv3 range coalescing fix
- stm32 coprocessor coexistence fixes
- mbigen MSI teardown fix
- non-DT secondary GIC infrastructure removed
- various cleanups (brcmstb-l2, mmp)
- new DT bindings (r8a774c0)
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/arm-gic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 626179077bb0..0f049b384ccd 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -158,8 +158,7 @@ int gic_of_init_child(struct device *dev, struct gic_chip_data **gic, int irq); * Legacy platforms not converted to DT yet must use this to init * their GIC */ -void gic_init(unsigned int nr, int start, - void __iomem *dist , void __iomem *cpu); +void gic_init(void __iomem *dist , void __iomem *cpu); int gicv2m_init(struct fwnode_handle *parent_handle, struct irq_domain *parent); |