diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-07-31 09:25:15 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-08-20 09:09:22 +0900 |
| commit | f2acab52e77650044b0772a6d7abbfef1eb4cede (patch) | |
| tree | f4f49cc52c257100520601b4cffe76943d0b817c | |
| parent | 9b0fd79af38cb1d68f5faf4fb528713116480e9f (diff) | |
ARM: shmobile: Rework multiplatform include workaround
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.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/irqs.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index fe3878a1a69a..a6a1dc0335ae 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -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 diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h index 4ff2d2aa94f0..8e28223f1b3c 100644 --- a/arch/arm/mach-shmobile/irqs.h +++ b/arch/arm/mach-shmobile/irqs.h @@ -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) |