| From 3126ef4e090161d7a9dfcde771a5819ca050232e Mon Sep 17 00:00:00 2001 |
| From: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Date: Tue, 14 May 2013 17:38:35 +0200 |
| Subject: 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> |
| (cherry picked from commit 7ac161c43506f60b07684bc8a98eeb50d8e8664c) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| arch/arm/mach-zynq/common.c | 2 -- |
| 1 file changed, 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 @@ |
| #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, |
| -- |
| 1.8.5.rc3 |
| |
