diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 21:01:00 +0800 | 
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 10:03:10 +0800 | 
| commit | e3372474cfa0dc016f10ec47baddbd1ed0abecf3 (patch) | |
| tree | ff239d4f665a9c30158f554600c463433e474a05 /arch/arm/mach-imx/system.c | |
| parent | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (diff) | |
| download | olio-linux-3.10-e3372474cfa0dc016f10ec47baddbd1ed0abecf3.tar.xz olio-linux-3.10-e3372474cfa0dc016f10ec47baddbd1ed0abecf3.zip  | |
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.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index 3da78cfc5a9..bbd80f25cdc 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -23,11 +23,12 @@  #include <linux/delay.h>  #include <mach/hardware.h> -#include <mach/common.h>  #include <asm/system_misc.h>  #include <asm/proc-fns.h>  #include <asm/mach-types.h> +#include "common.h" +  static void __iomem *wdog_base;  /*  |