diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-05-14 11:38:35 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2013-05-21 10:32:16 -0400 |
commit | 7ac161c43506f60b07684bc8a98eeb50d8e8664c (patch) | |
tree | 35d09a19b034c066848e73029177ea262fe55bf6 /arch/arm/mach-zynq/common.c | |
parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) |
ARM: zynq: 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 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>
Diffstat (limited to 'arch/arm/mach-zynq/common.c')
-rw-r--r-- | arch/arm/mach-zynq/common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 5bfe7035b73d..4c0199b88a04 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
26 | #include <linux/of_platform.h> | 26 | #include <linux/of_platform.h> |
27 | #include <linux/of.h> | 27 | #include <linux/of.h> |
28 | #include <linux/irqchip.h> | ||
29 | 28 | ||
30 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
31 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
@@ -106,7 +105,6 @@ static const char * const zynq_dt_match[] = { | |||
106 | MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") | 105 | MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") |
107 | .smp = smp_ops(zynq_smp_ops), | 106 | .smp = smp_ops(zynq_smp_ops), |
108 | .map_io = zynq_map_io, | 107 | .map_io = zynq_map_io, |
109 | .init_irq = irqchip_init, | ||
110 | .init_machine = zynq_init_machine, | 108 | .init_machine = zynq_init_machine, |
111 | .init_time = zynq_timer_init, | 109 | .init_time = zynq_timer_init, |
112 | .dt_compat = zynq_dt_match, | 110 | .dt_compat = zynq_dt_match, |