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/ata/sata_nv.c | |
| parent | 58c24a61614f5da290068e47fc5ec65370eb61dd (diff) | |
| parent | 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (diff) | |
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'drivers/ata/sata_nv.c')
| -rw-r--r-- | drivers/ata/sata_nv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 0c82d335c55..684fe04dbbb 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -772,7 +772,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev) } blk_queue_segment_boundary(sdev->request_queue, segment_boundary); - blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize); + blk_queue_max_segments(sdev->request_queue, sg_tablesize); ata_port_printk(ap, KERN_INFO, "DMA mask 0x%llX, segment boundary 0x%lX, hw segs %hu\n", (unsigned long long)*ap->host->dev->dma_mask, |