From 17c342ae23751424d3c943d02a4dbc8607e629d4 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 13 Sep 2012 21:18:39 +0800
Subject: [PATCH] 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>
---
arch/arm/mach-imx/cpu-imx25.c | 3 ++-
arch/arm/mach-imx/cpu-imx31.c | 2 +-
arch/arm/mach-imx/cpu-imx35.c | 3 ++-
arch/arm/mach-imx/{include/mach => }/iim.h | 0
4 files changed, 5 insertions(+), 3 deletions(-)
rename arch/arm/mach-imx/{include/mach => }/iim.h (100%)
diff --git a/arch/arm/mach-imx/cpu-imx25.c b/arch/arm/mach-imx/cpu-imx25.c
index 6914bcbf84e428..79d4d1c5689876 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 9d3a91c96a53ea..51c938fefe6d96 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 846e46eb8cbfd8..8b36d3ac79e27f 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
similarity index 100%
rename from arch/arm/mach-imx/include/mach/iim.h
rename to arch/arm/mach-imx/iim.h
--
GitLab