summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/board-marzen.c
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2014-06-17 16:47:29 +0900
committerSimon Horman <horms+renesas@verge.net.au>2014-06-17 17:09:38 +0900
commitb6bab1263c61e39cfc3427f54baff6f683f54298 (patch)
treea23a60d47c0becdcc4edb22a2c260e97d08600a0 /arch/arm/mach-shmobile/board-marzen.c
parentad6ffa0b59dc2c81474d7642fa2188e25cce99d6 (diff)
downloadlinux-b6bab1263c61e39cfc3427f54baff6f683f54298.tar.gz
linux-b6bab1263c61e39cfc3427f54baff6f683f54298.tar.xz
ARM: shmobile: Move most of irqs.h, keep some for pinctl
Move most of irqs.h so it can be used as #include "irqs.h" instead of the old style #include <mach/irqs.h>. Legacy code in drivers/pinctrl needs more work to get rid of the "mach" portion of the include path, so some part is left in the original location. Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Arnd Bergmann <arnd@arndb.de> [horms+renesas@verge.net.au: Do not add trailing blank line to irqs.h] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index d832a4477b4b..a9529bad4d60 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -44,10 +44,10 @@
#include <media/soc_camera.h>
#include <mach/r8a7779.h>
#include <mach/common.h>
-#include <mach/irqs.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/traps.h>
+#include "irqs.h"
/* Fixed 3.3V regulator to be used by SDHI0 */
static struct regulator_consumer_supply fixed3v3_power_consumers[] = {