diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:39:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:39:16 -0700 |
commit | 2cf812d732442e86c1e2018e23ad82f9bc594a38 (patch) | |
tree | c530171e406efdebc3fa91501f484260ee781296 /include | |
parent | ae83060026537885fd23737af161fee8afd04f4b (diff) | |
parent | 14d9fa352592582e457cf75022202766baac1348 (diff) | |
download | op-kernel-dev-2cf812d732442e86c1e2018e23ad82f9bc594a38.zip op-kernel-dev-2cf812d732442e86c1e2018e23ad82f9bc594a38.tar.gz |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Make SCSI SG v4 driver enabled by default and remove EXPERIMENTAL dependency, since udev depends on BSG
block: Update topology documentation
block: Stack optimal I/O size
block: Add a wrapper for setting minimum request size without a queue
block: Make blk_queue_stack_limits use the new stacking interface
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e7cb5db..69103e0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -913,6 +913,7 @@ extern void blk_queue_logical_block_size(struct request_queue *, unsigned short) extern void blk_queue_physical_block_size(struct request_queue *, unsigned short); extern void blk_queue_alignment_offset(struct request_queue *q, unsigned int alignment); +extern void blk_limits_io_min(struct queue_limits *limits, unsigned int min); extern void blk_queue_io_min(struct request_queue *q, unsigned int min); extern void blk_queue_io_opt(struct request_queue *q, unsigned int opt); extern void blk_set_default_limits(struct queue_limits *lim); |