summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-13 21:18:39 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:03:10 +0800
commit17c342ae23751424d3c943d02a4dbc8607e629d4 (patch)
tree6083cf25fde5163c0df55063be7e1bef151a7376
parente29248c9a7522cb50edd29f2a717be8f323cbeb3 (diff)
ARM: imx: include iim.h rather than mach/iim.h
Rename mach-imx/include/mach/iim.h to mach-imx/iim.h, and update users to include iim.h rather than mach/iim.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>
-rw-r--r--arch/arm/mach-imx/cpu-imx25.c3
-rw-r--r--arch/arm/mach-imx/cpu-imx31.c2
-rw-r--r--arch/arm/mach-imx/cpu-imx35.c3
-rw-r--r--arch/arm/mach-imx/iim.h (renamed from arch/arm/mach-imx/include/mach/iim.h)0
4 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/cpu-imx25.c b/arch/arm/mach-imx/cpu-imx25.c
index 6914bcbf84e4..79d4d1c56898 100644
--- a/arch/arm/mach-imx/cpu-imx25.c
+++ b/arch/arm/mach-imx/cpu-imx25.c
@@ -12,7 +12,8 @@
#include <linux/module.h>
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/iim.h>
+
+#include "iim.h"
static int mx25_cpu_rev = -1;
diff --git a/arch/arm/mach-imx/cpu-imx31.c b/arch/arm/mach-imx/cpu-imx31.c
index 9d3a91c96a53..51c938fefe6d 100644
--- a/arch/arm/mach-imx/cpu-imx31.c
+++ b/arch/arm/mach-imx/cpu-imx31.c
@@ -12,9 +12,9 @@
#include <linux/module.h>
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/iim.h>
#include "common.h"
+#include "iim.h"
static int mx31_cpu_rev = -1;
diff --git a/arch/arm/mach-imx/cpu-imx35.c b/arch/arm/mach-imx/cpu-imx35.c
index 846e46eb8cbf..8b36d3ac79e2 100644
--- a/arch/arm/mach-imx/cpu-imx35.c
+++ b/arch/arm/mach-imx/cpu-imx35.c
@@ -11,7 +11,8 @@
#include <linux/module.h>
#include <linux/io.h>
#include <mach/hardware.h>
-#include <mach/iim.h>
+
+#include "iim.h"
static int mx35_cpu_rev = -1;
diff --git a/arch/arm/mach-imx/include/mach/iim.h b/arch/arm/mach-imx/iim.h
index 315bffadafda..315bffadafda 100644
--- a/arch/arm/mach-imx/include/mach/iim.h
+++ b/arch/arm/mach-imx/iim.h