summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx31-dt.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-13 21:01:00 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:03:10 +0800
commite3372474cfa0dc016f10ec47baddbd1ed0abecf3 (patch)
treeff239d4f665a9c30158f554600c463433e474a05 /arch/arm/mach-imx/imx31-dt.c
parent3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (diff)
downloadblackbird-op-linux-e3372474cfa0dc016f10ec47baddbd1ed0abecf3.tar.gz
blackbird-op-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/imx31-dt.c')
-rw-r--r--arch/arm/mach-imx/imx31-dt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c
index a68ba207b2b7..408afcc91f0f 100644
--- a/arch/arm/mach-imx/imx31-dt.c
+++ b/arch/arm/mach-imx/imx31-dt.c
@@ -14,9 +14,10 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-#include <mach/common.h>
#include <mach/mx31.h>
+#include "common.h"
+
static const struct of_dev_auxdata imx31_auxdata_lookup[] __initconst = {
OF_DEV_AUXDATA("fsl,imx31-uart", MX31_UART1_BASE_ADDR,
"imx21-uart.0", NULL),
OpenPOWER on IntegriCloud