| From 50537521dd9e19af55208f0a6320b086a43d3c86 Mon Sep 17 00:00:00 2001 |
| From: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Date: Sun, 26 May 2013 22:05:56 +0900 |
| Subject: ARM: shmobile: r8a73a4: 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 0bdbe04db005e025d3522ad3ae9797a4954528e9) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-r8a73a4.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| index 7f45c2ed..a8c4e41b 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a73a4.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c |
| @@ -18,7 +18,6 @@ |
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| */ |
| #include <linux/irq.h> |
| -#include <linux/irqchip.h> |
| #include <linux/kernel.h> |
| #include <linux/of_platform.h> |
| #include <linux/platform_data/irq-renesas-irqc.h> |
| @@ -194,7 +193,6 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = { |
| }; |
| |
| DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)") |
| - .init_irq = irqchip_init, |
| .init_machine = r8a73a4_add_standard_devices_dt, |
| .init_time = shmobile_timer_init, |
| .dt_compat = r8a73a4_boards_compat_dt, |
| -- |
| 1.8.4.3.gca3854a |
| |
