diff options
author | Nicolas Pitre | 2009-03-16 02:41:23 +0100 |
---|---|---|
committer | Nicolas Pitre | 2009-03-16 02:41:23 +0100 |
commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
tree | fcdedce488db0f80c7a816e0b52df83a01972838 /drivers/scsi/ibmvscsi/ibmvfc.h | |
parent | [ARM] Orion: Fix some typos in the DNS-323 support code (diff) | |
parent | [ARM] update mach-types (diff) | |
download | kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.tar.gz kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.tar.xz kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.zip |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvfc.h')
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h index 87dafd0f8d44..b21e071b9862 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.h +++ b/drivers/scsi/ibmvscsi/ibmvfc.h @@ -32,7 +32,7 @@ #define IBMVFC_DRIVER_VERSION "1.0.4" #define IBMVFC_DRIVER_DATE "(November 14, 2008)" -#define IBMVFC_DEFAULT_TIMEOUT 15 +#define IBMVFC_DEFAULT_TIMEOUT 60 #define IBMVFC_INIT_TIMEOUT 120 #define IBMVFC_MAX_REQUESTS_DEFAULT 100 |