diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:29:35 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:29:35 +0300 |
| commit | c1dfdc7597d051b09555d4ae2acb90403e238746 (patch) | |
| tree | 86aa49f5a2ab25459f9196dd6724bbe6645b1375 /drivers/scsi/stex.c | |
| parent | efbe027e95dc13ac343b6130948418d7ead7ddf1 (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | linux-c1dfdc7597d051b09555d4ae2acb90403e238746.tar.xz | |
Merge commit 'v2.6.28-rc8' into sched/core
Diffstat (limited to 'drivers/scsi/stex.c')
| -rw-r--r-- | drivers/scsi/stex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 3790906a77d1..2fa830c0be27 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c @@ -477,7 +477,7 @@ stex_slave_config(struct scsi_device *sdev) { sdev->use_10_for_rw = 1; sdev->use_10_for_ms = 1; - sdev->timeout = 60 * HZ; + blk_queue_rq_timeout(sdev->request_queue, 60 * HZ); sdev->tagged_supported = 1; return 0; |