diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /drivers/scsi/ibmvscsi/ibmvscsi.c | |
| parent | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (diff) | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
| download | op-kernel-dev-aa2ba5f1082dc705745899584aac8416d710c056.zip op-kernel-dev-aa2ba5f1082dc705745899584aac8416d710c056.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvscsi.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 87e09f3..6cad175 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -1442,7 +1442,7 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev) spin_lock_irqsave(shost->host_lock, lock_flags); if (sdev->type == TYPE_DISK) { sdev->allow_restart = 1; - sdev->timeout = 60 * HZ; + blk_queue_rq_timeout(sdev->request_queue, 60 * HZ); } scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun); spin_unlock_irqrestore(shost->host_lock, lock_flags); |
