Merge branch 'at91-3.4-cleanup2-DT2' of git://github.com/at91linux/linux-at91 into...

[~andy/linux] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 7efd772336de998be8c53b01a1805ae63069de62..9c12f80882b0a9f9cc4bbafcb25a2c75707e732d 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -137,6 +137,8 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
                                struct request *next);
 void blk_recalc_rq_segments(struct request *rq);
 void blk_rq_set_mixed_merge(struct request *rq);
+bool blk_rq_merge_ok(struct request *rq, struct bio *bio);
+int blk_try_merge(struct request *rq, struct bio *bio);
 
 void blk_queue_congestion_threshold(struct request_queue *q);