diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 13:41:12 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 13:41:12 -0500 |
| commit | 6fc2de06ef1e691d032aa572478c905b7495a274 (patch) | |
| tree | 778df1440b045d67c997d7bd79ee3c6c11f57638 /drivers/scsi/pmcraid.c | |
| parent | 58c24a61614f5da290068e47fc5ec65370eb61dd (diff) | |
| parent | 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (diff) | |
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'drivers/scsi/pmcraid.c')
| -rw-r--r-- | drivers/scsi/pmcraid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index b6f1ef954af1..9b1c1433c26b 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
| @@ -235,7 +235,7 @@ static int pmcraid_slave_configure(struct scsi_device *scsi_dev) | |||
| 235 | scsi_dev->allow_restart = 1; | 235 | scsi_dev->allow_restart = 1; |
| 236 | blk_queue_rq_timeout(scsi_dev->request_queue, | 236 | blk_queue_rq_timeout(scsi_dev->request_queue, |
| 237 | PMCRAID_VSET_IO_TIMEOUT); | 237 | PMCRAID_VSET_IO_TIMEOUT); |
| 238 | blk_queue_max_sectors(scsi_dev->request_queue, | 238 | blk_queue_max_hw_sectors(scsi_dev->request_queue, |
| 239 | PMCRAID_VSET_MAX_SECTORS); | 239 | PMCRAID_VSET_MAX_SECTORS); |
| 240 | } | 240 | } |
| 241 | 241 | ||