diff --git a/[refs] b/[refs]
index dc4c88f88167..c98429812af3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2be39c079d692a07b55c8795051d40c0c94a3633
+refs/heads/master: bb1de8877c960b3b3e1c8337730df970b262fd44
diff --git a/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S b/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S
index 58a7fa8493e8..44ca7b1d8b8a 100644
--- a/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S
+++ b/trunk/arch/arm/mach-tegra/include/mach/debug-macro.S
@@ -27,7 +27,7 @@
 #include <linux/serial_reg.h>
 
 #include "../../iomap.h"
-#include <mach/irammap.h>
+#include "../../irammap.h"
 
 		.macro  addruart, rp, rv, tmp
 		adr	\rp, 99f		@ actual addr of 99f
diff --git a/trunk/arch/arm/mach-tegra/include/mach/uncompress.h b/trunk/arch/arm/mach-tegra/include/mach/uncompress.h
index 095216c4b564..27725750ca3e 100644
--- a/trunk/arch/arm/mach-tegra/include/mach/uncompress.h
+++ b/trunk/arch/arm/mach-tegra/include/mach/uncompress.h
@@ -28,9 +28,8 @@
 #include <linux/types.h>
 #include <linux/serial_reg.h>
 
-#include <mach/irammap.h>
-
 #include "../../iomap.h"
+#include "../../irammap.h"
 
 #define BIT(x) (1 << (x))
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
diff --git a/trunk/arch/arm/mach-tegra/include/mach/irammap.h b/trunk/arch/arm/mach-tegra/irammap.h
similarity index 100%
rename from trunk/arch/arm/mach-tegra/include/mach/irammap.h
rename to trunk/arch/arm/mach-tegra/irammap.h
diff --git a/trunk/arch/arm/mach-tegra/reset.c b/trunk/arch/arm/mach-tegra/reset.c
index 28e51b7803ef..e05da7d10c3b 100644
--- a/trunk/arch/arm/mach-tegra/reset.c
+++ b/trunk/arch/arm/mach-tegra/reset.c
@@ -22,9 +22,8 @@
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
 
-#include <mach/irammap.h>
-
 #include "iomap.h"
+#include "irammap.h"
 #include "reset.h"
 #include "fuse.h"