diff --git a/[refs] b/[refs]
index f5e557ac60d8..46f0bcbfbfaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcf6735e9cf08343bef9ff43205d91ef102af52f
+refs/heads/master: 3482d713a91befb8c96722cb8d55aed36c212d9e
diff --git a/trunk/arch/mips/mm/uasm.h b/trunk/arch/mips/include/asm/uasm.h
similarity index 100%
rename from trunk/arch/mips/mm/uasm.h
rename to trunk/arch/mips/include/asm/uasm.h
diff --git a/trunk/arch/mips/mm/page.c b/trunk/arch/mips/mm/page.c
index f5c73754d664..36272f7d3744 100644
--- a/trunk/arch/mips/mm/page.c
+++ b/trunk/arch/mips/mm/page.c
@@ -35,7 +35,7 @@
 #include <asm/sibyte/sb1250_dma.h>
 #endif
 
-#include "uasm.h"
+#include <asm/uasm.h>
 
 /* Registers used in the assembled routines. */
 #define ZERO 0
diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c
index eae45f0f9a16..bcf30026d1f6 100644
--- a/trunk/arch/mips/mm/tlbex.c
+++ b/trunk/arch/mips/mm/tlbex.c
@@ -29,8 +29,7 @@
 
 #include <asm/mmu_context.h>
 #include <asm/war.h>
-
-#include "uasm.h"
+#include <asm/uasm.h>
 
 static inline int r45k_bvahwbug(void)
 {
diff --git a/trunk/arch/mips/mm/uasm.c b/trunk/arch/mips/mm/uasm.c
index 0a165c5179a1..e3ca0f7ed01a 100644
--- a/trunk/arch/mips/mm/uasm.c
+++ b/trunk/arch/mips/mm/uasm.c
@@ -19,8 +19,7 @@
 #include <asm/inst.h>
 #include <asm/elf.h>
 #include <asm/bugs.h>
-
-#include "uasm.h"
+#include <asm/uasm.h>
 
 enum fields {
 	RS = 0x001,