summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aic7xxx/Kconfig.aic79xx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 13:12:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 13:12:41 -0800
commite0ae23550ffd3bfe319fa66879779be1a9a4a155 (patch)
treec9b7cce2baa430b8625dc01928260c7a6754f29b /drivers/scsi/aic7xxx/Kconfig.aic79xx
parentdd1c1853e2742f4938b271dbe0cee735e2ffa3d9 (diff)
parenta5b3c86e4bfb5689d68932105d3fdd1477c9c281 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/scsi/aic7xxx/Kconfig.aic79xx')
-rw-r--r--drivers/scsi/aic7xxx/Kconfig.aic79xx4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 69ed77fcb71..7955ebe8e1e 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -37,13 +37,13 @@ config AIC79XX_CMDS_PER_DEVICE
config AIC79XX_RESET_DELAY_MS
int "Initial bus reset delay in milli-seconds"
depends on SCSI_AIC79XX
- default "15000"
+ default "5000"
---help---
The number of milliseconds to delay after an initial bus reset.
The bus settle delay following all error recovery actions is
dictated by the SCSI layer and is not affected by this value.
- Default: 15000 (15 seconds)
+ Default: 5000 (5 seconds)
config AIC79XX_BUILD_FIRMWARE
bool "Build Adapter Firmware with Kernel Build"