diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
| commit | 6fc2de06ef1e691d032aa572478c905b7495a274 (patch) | |
| tree | 778df1440b045d67c997d7bd79ee3c6c11f57638 /drivers/block/ps3vram.c | |
| parent | 58c24a61614f5da290068e47fc5ec65370eb61dd (diff) | |
| parent | 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (diff) | |
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'drivers/block/ps3vram.c')
| -rw-r--r-- | drivers/block/ps3vram.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index 1fb6c3135fc8..83ebb390b164 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c @@ -751,10 +751,9 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) priv->queue = queue; queue->queuedata = dev; blk_queue_make_request(queue, ps3vram_make_request); - blk_queue_max_phys_segments(queue, MAX_PHYS_SEGMENTS); - blk_queue_max_hw_segments(queue, MAX_HW_SEGMENTS); - blk_queue_max_segment_size(queue, MAX_SEGMENT_SIZE); - blk_queue_max_sectors(queue, SAFE_MAX_SECTORS); + blk_queue_max_segments(queue, BLK_MAX_HW_SEGMENTS); + blk_queue_max_segment_size(queue, BLK_MAX_SEGMENT_SIZE); + blk_queue_max_hw_sectors(queue, BLK_SAFE_MAX_SECTORS); gendisk = alloc_disk(1); if (!gendisk) { |