diff --git a/[refs] b/[refs]
index 2e93f765fe45..337489446313 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cd614c8732172524c36cd5245620338928062b6
+refs/heads/master: a4ee0df8b3d007f0d685d38a56dc0b91e01aaaf7
diff --git a/trunk/include/linux/bsg.h b/trunk/include/linux/bsg.h
index 241eed03e42c..102dc096e1cb 100644
--- a/trunk/include/linux/bsg.h
+++ b/trunk/include/linux/bsg.h
@@ -59,8 +59,13 @@ struct bsg_class_device {
 extern int bsg_register_queue(struct request_queue *, struct device *, const char *);
 extern void bsg_unregister_queue(struct request_queue *);
 #else
-#define bsg_register_queue(disk, dev, name)		(0)
-#define bsg_unregister_queue(disk)	do { } while (0)
+static inline int bsg_register_queue(struct request_queue * rq, struct device *dev, const char *name)
+{
+	return 0;
+}
+static inline void bsg_unregister_queue(struct request_queue *rq)
+{
+}
 #endif
 
 #endif /* __KERNEL__ */