diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-27 09:17:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 09:17:21 +0200 |
| commit | 8d12ded3dd499e38e8022fe3ec53920d085e57a3 (patch) | |
| tree | 8b73e5a68f24b0bd33430bed8993de979825ffcf /include/linux/blkdev.h | |
| parent | d499c106843afa0703a68c64662bf42a16421aec (diff) | |
| parent | 68ab747604da98f0a0414f197f346ac22888fcee (diff) | |
Merge branch 'perf/urgent' into perf/core, before applying dependent patches
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 |