From 271ef12cd7a91a9420f120f8a3b7578fa601425e Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 13 Sep 2012 21:22:55 +0800
Subject: [PATCH] --- yaml --- r: 339739 b: refs/heads/master c:
 c045e3f137362fa34b337cdca66d3f6000a3b094 h: refs/heads/master i:   339737:
 563f95a84768e179d6b3184640410af12bf1e8e6   339735:
 3cd244188594aeede2e0d9ee89ddfbf6c7b4f6a5 v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/arm/mach-imx/{include/mach => }/iram.h | 0
 trunk/arch/arm/mach-imx/iram_alloc.c              | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename trunk/arch/arm/mach-imx/{include/mach => }/iram.h (100%)

diff --git a/[refs] b/[refs]
index 422e71518bf6..95f4ed45ac1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17c342ae23751424d3c943d02a4dbc8607e629d4
+refs/heads/master: c045e3f137362fa34b337cdca66d3f6000a3b094
diff --git a/trunk/arch/arm/mach-imx/include/mach/iram.h b/trunk/arch/arm/mach-imx/iram.h
similarity index 100%
rename from trunk/arch/arm/mach-imx/include/mach/iram.h
rename to trunk/arch/arm/mach-imx/iram.h
diff --git a/trunk/arch/arm/mach-imx/iram_alloc.c b/trunk/arch/arm/mach-imx/iram_alloc.c
index 074c3869626a..6c80424f678e 100644
--- a/trunk/arch/arm/mach-imx/iram_alloc.c
+++ b/trunk/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;