diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-27 14:40:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 14:40:10 +0200 |
| commit | d563a6bb3d107bf62ec7cd852a142d7e93f0db79 (patch) | |
| tree | 9902cb7c599126341a8fb32e572305c04fffb9c8 /include/linux/blkdev.h | |
| parent | 1fcb61c52bbdbbc46d132acf7dab9ad0eca433fe (diff) | |
| parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff) | |
Merge tag 'v4.1-rc5' into x86/mm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7f9a516f24de..5d93a6645e88 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -821,8 +821,6 @@ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t, extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t, struct scsi_ioctl_command __user *); -extern void blk_queue_bio(struct request_queue *q, struct bio *bio); - /* * A queue has just exitted congestion. Note this in the global counter of * congested queues, and wake up anyone who was waiting for requests to be |