diff --git a/[refs] b/[refs]
index 9dccb50bf61c..e603f2ac918f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39a51109dd14001185b0cd122ca46cce1d0795bf
+refs/heads/master: ae0c69acd61918cecd8e2949d9575271bc2fdfff
diff --git a/trunk/include/asm-mips/fixmap.h b/trunk/include/asm-mips/fixmap.h
index f27b96cfac2e..9cc8522a394f 100644
--- a/trunk/include/asm-mips/fixmap.h
+++ b/trunk/include/asm-mips/fixmap.h
@@ -60,16 +60,6 @@ enum fixed_addresses {
 	__end_of_fixed_addresses
 };
 
-extern void __set_fixmap(enum fixed_addresses idx,
-			 unsigned long phys, pgprot_t flags);
-
-#define set_fixmap(idx, phys) \
-		__set_fixmap(idx, phys, PAGE_KERNEL)
-/*
- * Some hardware wants to get fixmapped without caching.
- */
-#define set_fixmap_nocache(idx, phys) \
-		__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
 /*
  * used by vmalloc.c.
  *