ARM: shmobile: Rework multiplatform include workaround

From: Magnus Damm <[email protected]>

Now when the majority of the include files have moved from arch/arm/mach-shmobile/include/mach/ to arch/arm/mach-shmobile/ remove the header include file workaround in the Makefile...

... and add another workaround in irqs.h to cope with the fact that <mach/irqs.h> needs to be where it is until the PFC code has been updated to remove legacy non-DT interfaces.

---

Written against renesas-devel-v3.16-rc7-20140729

 arch/arm/mach-shmobile/Makefile |    2 --
 arch/arm/mach-shmobile/irqs.h   |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

@@ -2,8 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
-
 # Common objects
 obj-y				:= timer.o console.o
 

@@ -2,7 +2,7 @@
 #define __SHMOBILE_IRQS_H
 
 #include <linux/sh_intc.h>
-#include <mach/irqs.h>
+#include "include/mach/irqs.h"
 
 /* GIC */
 #define gic_spi(nr)		((nr) + 32)