diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-10 19:16:43 +1000 |
| commit | 50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6 (patch) | |
| tree | c76f080377dd611857fa33f38a2b8a2af4576f8b /include/linux/blkdev.h | |
| parent | a8b91e43afd736fcebb0836359e5ddaeae45b2ab (diff) | |
| parent | 50fb31cfed9218b439360caf7c0399b00042da15 (diff) | |
Merge branch 'merge' into next
We want to bring in the latest IRQ fixes
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ba43f408baa3..07954b05b86c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -827,7 +827,6 @@ extern bool __blk_end_request_err(struct request *rq, int error); extern void blk_complete_request(struct request *); extern void __blk_complete_request(struct request *); extern void blk_abort_request(struct request *); -extern void blk_abort_queue(struct request_queue *); extern void blk_unprep_request(struct request *); /* |