diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-05 16:57:58 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-05 16:58:11 +0000 |
commit | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (patch) | |
tree | 0a74b982ab63dd20433bfe6abefdc8dd1b7336b4 /arch/arm/include/asm/hardware/gic.h | |
parent | 7cb7f82611dddb4b471d42d0fad645dd0dc3f360 (diff) | |
parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) |
Merge branch 'depends/irqdomain' into next/drivers
This is needed in order for the tegra/soc-drivers branch
to work.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/hardware/gic.h')
-rw-r--r-- | arch/arm/include/asm/hardware/gic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h index 4bdfe001869..4b1ce6cd477 100644 --- a/arch/arm/include/asm/hardware/gic.h +++ b/arch/arm/include/asm/hardware/gic.h @@ -39,7 +39,7 @@ struct device_node; extern struct irq_chip gic_arch_extn; void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *, - u32 offset); + u32 offset, struct device_node *); int gic_of_init(struct device_node *node, struct device_node *parent); void gic_secondary_init(unsigned int); void gic_handle_irq(struct pt_regs *regs); @@ -49,7 +49,7 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq); static inline void gic_init(unsigned int nr, int start, void __iomem *dist , void __iomem *cpu) { - gic_init_bases(nr, start, dist, cpu, 0); + gic_init_bases(nr, start, dist, cpu, 0, NULL); } #endif |