diff --git a/[refs] b/[refs]
index 72554477e7f4..6f33de16429a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f6fd5c916c8416588f5797e7837b9e81b3251a5
+refs/heads/master: 0146d7875976795fe364b4a3da629975ebd37671
diff --git a/trunk/arch/sh/include/mach-se/mach/mrshpc.h b/trunk/arch/sh/include/mach-se/mach/mrshpc.h
index 95c8b8254015..56287ee8563a 100644
--- a/trunk/arch/sh/include/mach-se/mach/mrshpc.h
+++ b/trunk/arch/sh/include/mach-se/mach/mrshpc.h
@@ -3,7 +3,7 @@
 
 #include <linux/io.h>
 
-static void __init mrshpc_setup_windows(void)
+static inline void __init mrshpc_setup_windows(void)
 {
 	if ((__raw_readw(MRSHPC_CSR) & 0x000c) != 0)
 		return;	/* Not detected */