diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:26:47 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-15 07:28:19 +0200 |
| commit | 5e1249ff36d29653dde09fedf1d04a4ecff028c2 (patch) | |
| tree | 900c8f019139e9be4d4fe403cbe67d4dfd487f92 /include/linux/blkdev.h | |
| parent | a2ee48d60eed9cfb6447a4233370aee4ea88108b (diff) | |
| parent | fe4c63c8cbd22251f8ce8bcb7853e46385f7af82 (diff) | |
Merge remote-tracking branch 'origin/drm-intel-next-queued' into drm-intel-next-queued
Pull in patches Jani applied while I was on vacation.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
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 |