diff --git a/[refs] b/[refs]
index 1ebab88dce7a..fc293d424bfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bff489a1496d363e9a640c00eb8970da15079dd
+refs/heads/master: 52e8b118ecd17185ce514cd3f955094c1d8f4288
diff --git a/trunk/arch/sh/mm/tlb-nommu.c b/trunk/arch/sh/mm/tlb-nommu.c
index 8842620604c3..15111bc7ddd6 100644
--- a/trunk/arch/sh/mm/tlb-nommu.c
+++ b/trunk/arch/sh/mm/tlb-nommu.c
@@ -55,3 +55,7 @@ void __init page_table_range_init(unsigned long start, unsigned long end,
 				  pgd_t *pgd_base)
 {
 }
+
+void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
+{
+}