diff --git a/[refs] b/[refs]
index cef2552e7337..eda170aac015 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ca91cd0336b05b91c51b403c9ed9d297813533f
+refs/heads/master: 780513ecb80ea0934fc6833efc4f5ed9ab4ff9bb
diff --git a/trunk/include/linux/blktrace_api.h b/trunk/include/linux/blktrace_api.h
index 972093bf1853..2e105a12fe29 100644
--- a/trunk/include/linux/blktrace_api.h
+++ b/trunk/include/linux/blktrace_api.h
@@ -290,7 +290,12 @@ static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio,
 #define blk_add_trace_generic(q, rq, rw, what)	do { } while (0)
 #define blk_add_trace_pdu_int(q, what, bio, pdu)	do { } while (0)
 #define blk_add_trace_remap(q, bio, dev, f, t)	do {} while (0)
-#define do_blk_trace_setup(q, bdev, buts)	do {} while (0)
+static inline int do_blk_trace_setup(struct request_queue *q,
+				     struct block_device *bdev,
+				     struct blk_user_trace_setup *buts)
+{
+	return 0;
+}
 #endif /* CONFIG_BLK_DEV_IO_TRACE */
 #endif /* __KERNEL__ */
 #endif