diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 18:13:41 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 18:13:41 +0200 |
commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /block/blk.h | |
parent | 50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff) | |
parent | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff) | |
download | op-kernel-dev-03fe805a098422d27cbbbad29a54ff1349da3622.zip op-kernel-dev-03fe805a098422d27cbbbad29a54ff1349da3622.tar.gz |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'block/blk.h')
-rw-r--r-- | block/blk.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index 45385e9..6748c4f 100644 --- a/block/blk.h +++ b/block/blk.h @@ -84,7 +84,6 @@ static inline void blk_clear_rq_complete(struct request *rq) #define ELV_ON_HASH(rq) ((rq)->cmd_flags & REQ_HASHED) void blk_insert_flush(struct request *rq); -void blk_abort_flushes(struct request_queue *q); static inline struct request *__elv_next_request(struct request_queue *q) { |