diff --git a/[refs] b/[refs]
index 5eaef4cb1546..6a6ffc22e99b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28d20e2d6e94434827e11c310788b87204b84559
+refs/heads/master: 23de29de2d8b227943be191d59fb6d983996d55e
diff --git a/trunk/include/linux/trace_seq.h b/trunk/include/linux/trace_seq.h
index 37db9bdfbc1a..ba9627f00d3f 100644
--- a/trunk/include/linux/trace_seq.h
+++ b/trunk/include/linux/trace_seq.h
@@ -63,7 +63,7 @@ static inline int trace_seq_puts(struct trace_seq *s, const char *str)
 {
 	return 0;
 }
-static inline int trace_seq_putc(struct trace_seq *s, unsigned char c);
+static inline int trace_seq_putc(struct trace_seq *s, unsigned char c)
 {
 	return 0;
 }