aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/system.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-13 09:01:00 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-10-14 22:03:10 -0400
commite3372474cfa0dc016f10ec47baddbd1ed0abecf3 (patch)
treeff239d4f665a9c30158f554600c463433e474a05 /arch/arm/mach-imx/system.c
parent3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (diff)
ARM: imx: include common.h rather than mach/common.h
Rename mach-imx/include/mach/common.h to mach-imx/common.h and update all users to include common.h rather than mach/common.h. It also removes an unneeded inclusion to common.h in mach-imx/devices/devices.c. 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
index 3da78cfc5a94..bbd80f25cdc4 100644
--- a/arch/arm/mach-imx/system.c
+++ b/arch/arm/mach-imx/system.c
@@ -23,11 +23,12 @@
23#include <linux/delay.h> 23#include <linux/delay.h>
24 24
25#include <mach/hardware.h> 25#include <mach/hardware.h>
26#include <mach/common.h>
27#include <asm/system_misc.h> 26#include <asm/system_misc.h>
28#include <asm/proc-fns.h> 27#include <asm/proc-fns.h>
29#include <asm/mach-types.h> 28#include <asm/mach-types.h>
30 29
30#include "common.h"
31
31static void __iomem *wdog_base; 32static void __iomem *wdog_base;
32 33
33/* 34/*