aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-04-18 16:08:50 -0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-05-24 04:12:52 -0400
commit4415788803bc3ec75a9fe88da09f8035af273dc9 (patch)
tree713ae57c83b7d066e419aae27f3763227d28adb4
parent33aa9d0815ce0caf9493a700e139a1778e9ec04b (diff)
ARM: vexpress: Remove init_irq declaration in machine description
Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is specified") removed the need to explictly setup the init_irq field in the machine description when using only irqchip_init. Remove that declaration for vexpress as well. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Pawel Moll <pawel.moll@arm.com>
-rw-r--r--arch/arm/mach-vexpress/v2m.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 8802030df98d..d6016970e2fe 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -9,7 +9,6 @@
9#include <linux/clocksource.h> 9#include <linux/clocksource.h>
10#include <linux/smp.h> 10#include <linux/smp.h>
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/irqchip.h>
13#include <linux/of_address.h> 12#include <linux/of_address.h>
14#include <linux/of_fdt.h> 13#include <linux/of_fdt.h>
15#include <linux/of_irq.h> 14#include <linux/of_irq.h>
@@ -458,7 +457,6 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
458 .smp = smp_ops(vexpress_smp_ops), 457 .smp = smp_ops(vexpress_smp_ops),
459 .map_io = v2m_dt_map_io, 458 .map_io = v2m_dt_map_io,
460 .init_early = v2m_dt_init_early, 459 .init_early = v2m_dt_init_early,
461 .init_irq = irqchip_init,
462 .init_time = v2m_dt_timer_init, 460 .init_time = v2m_dt_timer_init,
463 .init_machine = v2m_dt_init, 461 .init_machine = v2m_dt_init,
464MACHINE_END 462MACHINE_END