diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 12:29:45 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-13 12:29:45 +0200 |
| commit | c30f33437c3f85ec48353a1ef811e148217a2aaf (patch) | |
| tree | d5a0ca1e8d091a30fece2e9aeed285225c026049 /block/blk-settings.c | |
| parent | 132cc538cd90f60a0b5df6a512dfd4bc5fe2039a (diff) | |
| parent | 2ec24ff1d1875defa742c76c9c7d74dca06b7e1f (diff) | |
| download | op-kernel-dev-c30f33437c3f85ec48353a1ef811e148217a2aaf.zip op-kernel-dev-c30f33437c3f85ec48353a1ef811e148217a2aaf.tar.gz | |
Merge branch 'for-linus' into for-2.6.33
Diffstat (limited to 'block/blk-settings.c')
| -rw-r--r-- | block/blk-settings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index e0695bc..66d4aa8 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -242,7 +242,7 @@ EXPORT_SYMBOL(blk_queue_max_hw_sectors); /** * blk_queue_max_discard_sectors - set max sectors for a single discard * @q: the request queue for the device - * @max_discard: maximum number of sectors to discard + * @max_discard_sectors: maximum number of sectors to discard **/ void blk_queue_max_discard_sectors(struct request_queue *q, unsigned int max_discard_sectors) |
