diff --git a/[refs] b/[refs]
index a94017992064..72d29cad0642 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a2f505ee721f0b5480464673ca71520c0ac2eb6
+refs/heads/master: fb9de7ebc3a2eb7ddb83c92e288447a0c313bced
diff --git a/trunk/arch/xtensa/include/asm/mmu.h b/trunk/arch/xtensa/include/asm/mmu.h
index 04890d6e2335..8554b2c8b17a 100644
--- a/trunk/arch/xtensa/include/asm/mmu.h
+++ b/trunk/arch/xtensa/include/asm/mmu.h
@@ -12,7 +12,7 @@
 #define _XTENSA_MMU_H
 
 #ifndef CONFIG_MMU
-#include <asm/nommu.h>
+#include <asm-generic/mmu.h>
 #else
 
 /* Default "unsigned long" context */
diff --git a/trunk/arch/xtensa/include/asm/nommu.h b/trunk/arch/xtensa/include/asm/nommu.h
deleted file mode 100644
index dce2c438c5ba..000000000000
--- a/trunk/arch/xtensa/include/asm/nommu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-typedef struct {
-	unsigned long end_brk;
-} mm_context_t;