]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
ARM: zynq: Remove init_irq declaration in machine description
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Tue, 14 May 2013 15:38:35 +0000 (17:38 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 21 May 2013 14:32:16 +0000 (16:32 +0200)
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 zynq as well.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/mach-zynq/common.c

index 5bfe7035b73d96b6394046a67f5a50fcc287d782..4c0199b88a0486e5d22c13d6600023f7ac80deb6 100644 (file)
@@ -25,7 +25,6 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/of.h>
-#include <linux/irqchip.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -106,7 +105,6 @@ static const char * const zynq_dt_match[] = {
 MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
        .smp            = smp_ops(zynq_smp_ops),
        .map_io         = zynq_map_io,
-       .init_irq       = irqchip_init,
        .init_machine   = zynq_init_machine,
        .init_time      = zynq_timer_init,
        .dt_compat      = zynq_dt_match,