Commit f2acab52 authored Jul 31, 2014 by Magnus Damm Committed by Simon Horman Aug 20, 2014

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>

parent 9b0fd79a

arch/arm/mach-shmobile/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/arm/mach-shmobile/irqs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)