diff --git a/[refs] b/[refs]
index cafb652378af..7147981ce28f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3189cdb31622f4e40688ce5a6fc5d940b42bc805
+refs/heads/master: 8e668b5b3455207e4540fc7ccab9ecf70142f288
diff --git a/trunk/include/linux/trace_seq.h b/trunk/include/linux/trace_seq.h
index 15ca2c71af13..37db9bdfbc1a 100644
--- a/trunk/include/linux/trace_seq.h
+++ b/trunk/include/linux/trace_seq.h
@@ -42,7 +42,6 @@ extern int trace_seq_path(struct trace_seq *s, struct path *path);
 
 #else /* CONFIG_TRACING */
 static inline int trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
-	__attribute__ ((format (printf, 2, 3)))
 {
 	return 0;
 }