| From 24451c0ccc09a408a7337f3afaf7e85f075aa7d6 Mon Sep 17 00:00:00 2001 |
| From: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Date: Mon, 27 May 2013 18:00:22 +0900 |
| Subject: ARM: shmobile: r8a7790: 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 125332daf2e4119614c561bc8cbf1f49cd243023) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-r8a7790.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c |
| index 28f94752..d405dbd4 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7790.c |
| @@ -19,7 +19,6 @@ |
| */ |
| |
| #include <linux/irq.h> |
| -#include <linux/irqchip.h> |
| #include <linux/kernel.h> |
| #include <linux/of_platform.h> |
| #include <linux/serial_sci.h> |
| @@ -188,7 +187,6 @@ static const char *r8a7790_boards_compat_dt[] __initdata = { |
| }; |
| |
| DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)") |
| - .init_irq = irqchip_init, |
| .init_machine = r8a7790_add_standard_devices_dt, |
| .init_time = r8a7790_timer_init, |
| .dt_compat = r8a7790_boards_compat_dt, |
| -- |
| 1.8.4.3.gca3854a |
| |
