diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-18 16:08:50 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-05-24 04:12:50 -0400 |
commit | 7df1af8dca4f7f5a226b2f55a6f8452cd353306d (patch) | |
tree | b5d6f371687d4fe8d5c94513be4e0aff20bca573 /arch/arm/mach-nomadik/cpu-8815.c | |
parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) |
ARM: nomadik: 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 nomadik as well.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik/cpu-8815.c')
-rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 59f6ff5c9bae..46cce9baa129 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
28 | #include <linux/irqchip.h> | ||
29 | #include <linux/platform_data/clk-nomadik.h> | 28 | #include <linux/platform_data/clk-nomadik.h> |
30 | #include <linux/platform_data/pinctrl-nomadik.h> | 29 | #include <linux/platform_data/pinctrl-nomadik.h> |
31 | #include <linux/pinctrl/machine.h> | 30 | #include <linux/pinctrl/machine.h> |
@@ -323,7 +322,6 @@ static const char * cpu8815_board_compat[] = { | |||
323 | 322 | ||
324 | DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815") | 323 | DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815") |
325 | .map_io = cpu8815_map_io, | 324 | .map_io = cpu8815_map_io, |
326 | .init_irq = irqchip_init, | ||
327 | .init_time = cpu8815_timer_init_of, | 325 | .init_time = cpu8815_timer_init_of, |
328 | .init_machine = cpu8815_init_of, | 326 | .init_machine = cpu8815_init_of, |
329 | .restart = cpu8815_restart, | 327 | .restart = cpu8815_restart, |