diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-05-14 11:38:48 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-19 16:15:56 -0400 |
commit | 84f013bc3a2e36365abff9416714e34c2993a4a5 (patch) | |
tree | b639b5447df852e1deaa618d3b902df9da1af649 | |
parent | 49ed97f751bfaea133ae5c44f1247db09b9ca144 (diff) |
ARM: mvebu: 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 mvebu as well.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 1c48890bb72b..97beb8724fda 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/clk/mvebu.h> | 20 | #include <linux/clk/mvebu.h> |
21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
22 | #include <linux/mbus.h> | 22 | #include <linux/mbus.h> |
23 | #include <linux/irqchip.h> | ||
24 | #include <asm/hardware/cache-l2x0.h> | 23 | #include <asm/hardware/cache-l2x0.h> |
25 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
26 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
@@ -89,7 +88,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") | |||
89 | .init_machine = armada_370_xp_dt_init, | 88 | .init_machine = armada_370_xp_dt_init, |
90 | .map_io = armada_370_xp_map_io, | 89 | .map_io = armada_370_xp_map_io, |
91 | .init_early = armada_370_xp_init_early, | 90 | .init_early = armada_370_xp_init_early, |
92 | .init_irq = irqchip_init, | ||
93 | .init_time = armada_370_xp_timer_and_clk_init, | 91 | .init_time = armada_370_xp_timer_and_clk_init, |
94 | .restart = mvebu_restart, | 92 | .restart = mvebu_restart, |
95 | .dt_compat = armada_370_xp_dt_compat, | 93 | .dt_compat = armada_370_xp_dt_compat, |