summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-13 21:22:55 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:03:11 +0800
commitc045e3f137362fa34b337cdca66d3f6000a3b094 (patch)
treeaad31c8d34fe88b3e2886c27d28cc5d9571204ae
parent17c342ae23751424d3c943d02a4dbc8607e629d4 (diff)
ARM: imx: include iram.h rather than mach/iram.h
Rename mach-imx/include/mach/iram.h to mach-imx/iram.h, and update users to include iram.h rather than mach/iram.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/iram.h (renamed from arch/arm/mach-imx/include/mach/iram.h)0
-rw-r--r--arch/arm/mach-imx/iram_alloc.c3
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/include/mach/iram.h b/arch/arm/mach-imx/iram.h
index 022690c3370..022690c3370 100644
--- a/arch/arm/mach-imx/include/mach/iram.h
+++ b/arch/arm/mach-imx/iram.h
diff --git a/arch/arm/mach-imx/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c
index 074c3869626..6c80424f678 100644
--- a/arch/arm/mach-imx/iram_alloc.c
+++ b/arch/arm/mach-imx/iram_alloc.c
@@ -22,7 +22,8 @@
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/genalloc.h>
-#include <mach/iram.h>
+
+#include "iram.h"
static unsigned long iram_phys_base;
static void __iomem *iram_virt_base;