| From d5f8176271e63798d7de990e25df5ec3fa1d79d1 Mon Sep 17 00:00:00 2001 |
| From: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Date: Sun, 26 May 2013 22:05:23 +0900 |
| Subject: ARM: shmobile: emev2: 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 shmobile as well. |
| |
| Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 34dd9fc04a028edad7658006764c4d18ac3dca73) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-emev2.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c |
| index 1ccddd22..6e8b6ac3 100644 |
| --- a/arch/arm/mach-shmobile/setup-emev2.c |
| +++ b/arch/arm/mach-shmobile/setup-emev2.c |
| @@ -20,7 +20,6 @@ |
| #include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/irq.h> |
| -#include <linux/irqchip.h> |
| #include <linux/platform_device.h> |
| #include <linux/platform_data/gpio-em.h> |
| #include <linux/of_platform.h> |
| @@ -454,7 +453,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") |
| .smp = smp_ops(emev2_smp_ops), |
| .init_early = emev2_init_delay, |
| .nr_irqs = NR_IRQS_LEGACY, |
| - .init_irq = irqchip_init, |
| .init_machine = emev2_add_standard_devices_dt, |
| .dt_compat = emev2_boards_compat_dt, |
| MACHINE_END |
| -- |
| 1.8.4.3.gca3854a |
| |
