diff --git a/[refs] b/[refs]
index ecee67ee9e44..bc93482c1050 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31c3af503eb75488aafb7a3d292b9e00962f2cee
+refs/heads/master: 70911b861bfbba1851cbb3497635030f34703c7a
diff --git a/trunk/arch/sh/include/asm/io.h b/trunk/arch/sh/include/asm/io.h
index 4bad72a1b39e..e4f563f472eb 100644
--- a/trunk/arch/sh/include/asm/io.h
+++ b/trunk/arch/sh/include/asm/io.h
@@ -245,10 +245,11 @@ extern int iounmap_fixed(void __iomem *);
 extern void ioremap_fixed_init(void);
 #else
 static inline void __iomem *
-ioremap_fixed(resource_size t phys_addr, unsigned long offset,
+ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
 	      unsigned long size, pgprot_t prot)
 {
 	BUG();
+	return NULL;
 }
 
 static inline void ioremap_fixed_init(void) { }