aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/system.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-14 02:14:45 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-10-14 22:05:43 -0400
commit50f2de61269bbe2f40bead1969a9594fa8599b93 (patch)
tree842f17cd25c5350f602a3fb31960e34bb3855b21 /arch/arm/mach-imx/system.c
parent6dde5ac5220b3b9c28f82f291b64eca3e5ebe80d (diff)
ARM: imx: include hardware.h rather than mach/hardware.h
It moves a bunch of header files included in hardware.h and itself from mach-imx/include/mach to mach-imx, and updates users to include hardware.h rather than mach/hardware.h. The files in mach-imx/devices will need to include "../hardware.h". Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/system.c')
-rw-r--r--arch/arm/mach-imx/system.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
index bbd80f25cdc4..695e0d73bf85 100644
--- a/arch/arm/mach-imx/system.c
+++ b/arch/arm/mach-imx/system.c
@@ -22,12 +22,12 @@
22#include <linux/err.h> 22#include <linux/err.h>
23#include <linux/delay.h> 23#include <linux/delay.h>
24 24
25#include <mach/hardware.h>
26#include <asm/system_misc.h> 25#include <asm/system_misc.h>
27#include <asm/proc-fns.h> 26#include <asm/proc-fns.h>
28#include <asm/mach-types.h> 27#include <asm/mach-types.h>
29 28
30#include "common.h" 29#include "common.h"
30#include "hardware.h"
31 31
32static void __iomem *wdog_base; 32static void __iomem *wdog_base;
33 33