summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/pm-imx6q.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-13 15:01:00 +0200
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 04:03:10 +0200
commite3372474cfa0dc016f10ec47baddbd1ed0abecf3 (patch)
treeff239d4f665a9c30158f554600c463433e474a05 /arch/arm/mach-imx/pm-imx6q.c
parentARM: imx: merge plat-mxc into mach-imx (diff)
downloadlinux-e3372474cfa0dc016f10ec47baddbd1ed0abecf3.tar.xz
linux-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/pm-imx6q.c')
-rw-r--r--arch/arm/mach-imx/pm-imx6q.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c
index f7b0c2b1b905..05618afb5596 100644
--- a/arch/arm/mach-imx/pm-imx6q.c
+++ b/arch/arm/mach-imx/pm-imx6q.c
@@ -18,9 +18,10 @@
#include <asm/proc-fns.h>
#include <asm/suspend.h>
#include <asm/hardware/cache-l2x0.h>
-#include <mach/common.h>
#include <mach/hardware.h>
+#include "common.h"
+
extern unsigned long phys_l2x0_saved_regs;
static int imx6q_suspend_finish(unsigned long val)