1 files changed, 105 insertions, 0 deletions
diff --git a/patches.renesas/0815-ARM-shmobile-Move-intc.h-cleanup-sh_intc.h-usage.patch b/patches.renesas/0815-ARM-shmobile-Move-intc.h-cleanup-sh_intc.h-usage.patch
new file mode 100644
index 00000000000000..8f414234b66cf8
--- /dev/null
+++ b/patches.renesas/0815-ARM-shmobile-Move-intc.h-cleanup-sh_intc.h-usage.patch
@@ -0,0 +1,105 @@
+From 698e13fe676095028712e2774e0d02b8a5a80271 Mon Sep 17 00:00:00 2001
+From: Magnus Damm <damm+renesas@opensource.se>
+Date: Tue, 17 Jun 2014 16:47:05 +0900
+Subject: ARM: shmobile: Move intc.h, cleanup sh_intc.h usage
+
+Change location of intc.h so it can be used as #include "intc.h"
+instead of the old style #include <mach/intc.h>. Also clean up
+some code to get rid of redundant #include <linux/sh_intc.h>.
+
+Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
+Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Acked-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+(cherry picked from commit 6200e2c1847b2282db13877b2398a5bee9e42254)
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+---
+ arch/arm/mach-shmobile/board-mackerel.c          | 1 -
+ arch/arm/mach-shmobile/intc-sh7372.c             | 3 +--
+ arch/arm/mach-shmobile/intc-sh73a0.c             | 3 +--
+ arch/arm/mach-shmobile/{include/mach => }/intc.h | 0
+ arch/arm/mach-shmobile/setup-sh7372.c            | 1 -
+ arch/arm/mach-shmobile/setup-sh73a0.c            | 1 -
+ 6 files changed, 2 insertions(+), 7 deletions(-)
+ rename arch/arm/mach-shmobile/{include/mach => }/intc.h (100%)
+
+diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
+index 0ff4d8e45cf7..0864a63291d9 100644
+--- a/arch/arm/mach-shmobile/board-mackerel.c
++++ b/arch/arm/mach-shmobile/board-mackerel.c
+@@ -47,7 +47,6 @@
+ #include <linux/regulator/fixed.h>
+ #include <linux/regulator/machine.h>
+ #include <linux/smsc911x.h>
+-#include <linux/sh_intc.h>
+ #include <linux/tca6416_keypad.h>
+ #include <linux/usb/renesas_usbhs.h>
+ #include <linux/dma-mapping.h>
+diff --git a/arch/arm/mach-shmobile/intc-sh7372.c b/arch/arm/mach-shmobile/intc-sh7372.c
+index a91caad7db7c..bd021238c77b 100644
+--- a/arch/arm/mach-shmobile/intc-sh7372.c
++++ b/arch/arm/mach-shmobile/intc-sh7372.c
+@@ -22,11 +22,10 @@
+ #include <linux/module.h>
+ #include <linux/irq.h>
+ #include <linux/io.h>
+-#include <linux/sh_intc.h>
+-#include <mach/intc.h>
+ #include <mach/irqs.h>
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
++#include "intc.h"
+ 
+ enum {
+ 	UNUSED_INTCA = 0,
+diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
+index 19a26f4579b3..facb70e6a0b0 100644
+--- a/arch/arm/mach-shmobile/intc-sh73a0.c
++++ b/arch/arm/mach-shmobile/intc-sh73a0.c
+@@ -22,14 +22,13 @@
+ #include <linux/module.h>
+ #include <linux/irq.h>
+ #include <linux/io.h>
+-#include <linux/sh_intc.h>
+ #include <linux/irqchip.h>
+ #include <linux/irqchip/arm-gic.h>
+-#include <mach/intc.h>
+ #include <mach/irqs.h>
+ #include <mach/sh73a0.h>
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
++#include "intc.h"
+ 
+ enum {
+ 	UNUSED = 0,
+diff --git a/arch/arm/mach-shmobile/include/mach/intc.h b/arch/arm/mach-shmobile/intc.h
+similarity index 100%
+rename from arch/arm/mach-shmobile/include/mach/intc.h
+rename to arch/arm/mach-shmobile/intc.h
+diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
+index 2a8b9f2a2f54..3b23ced2eb55 100644
+--- a/arch/arm/mach-shmobile/setup-sh7372.c
++++ b/arch/arm/mach-shmobile/setup-sh7372.c
+@@ -29,7 +29,6 @@
+ #include <linux/io.h>
+ #include <linux/serial_sci.h>
+ #include <linux/sh_dma.h>
+-#include <linux/sh_intc.h>
+ #include <linux/sh_timer.h>
+ #include <linux/pm_domain.h>
+ #include <linux/dma-mapping.h>
+diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
+index ad00724a2269..a758d2adca31 100644
+--- a/arch/arm/mach-shmobile/setup-sh73a0.c
++++ b/arch/arm/mach-shmobile/setup-sh73a0.c
+@@ -29,7 +29,6 @@
+ #include <linux/io.h>
+ #include <linux/serial_sci.h>
+ #include <linux/sh_dma.h>
+-#include <linux/sh_intc.h>
+ #include <linux/sh_timer.h>
+ #include <linux/platform_data/sh_ipmmu.h>
+ #include <linux/platform_data/irq-renesas-intc-irqpin.h>
+-- 
+2.1.2
+