diff --git a/[refs] b/[refs]
index 70d43f2ecd0d..8c42b9c00a5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f5a54e371ca20b119b73704f6c01b71295c1714
+refs/heads/master: 7b928c23fa3e9fa37d1d4ba52ba963f41ee5aae0
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index f7fb92045bf0..ce929cb55435 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -183,7 +183,10 @@ extern void ftrace_dump(void);
 static inline void
 ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { }
 static inline int
-ftrace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 0)))
+ftrace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 0)));
+
+static inline int
+ftrace_printk(const char *fmt, ...)
 {
 	return 0;
 }