diff --git a/[refs] b/[refs]
index dbd84bf34a40..6cbda81c4e0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0157903e840f970c90880426505cbb8be5ddde68
+refs/heads/master: fb1c7762b9b1f3c53daf0e700e977d77a29bcf04
diff --git a/trunk/include/asm-arm/tlbflush.h b/trunk/include/asm-arm/tlbflush.h
index d64b180200fa..728992451dd1 100644
--- a/trunk/include/asm-arm/tlbflush.h
+++ b/trunk/include/asm-arm/tlbflush.h
@@ -16,7 +16,7 @@
 
 #define tlb_flush(tlb)	((void) tlb)
 
-#else /* CONFIG_MMY */
+#else /* CONFIG_MMU */
 
 #include <asm/glue.h>