X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Faic7xxx%2FKconfig.aic79xx;h=911ea1756e554e30beaccaed9662a1cd3a123cb2;hb=refs%2Fheads%2Fvserver;hp=b29981521492923bd919e6577d1caffb9ca16abe;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index b29981521..911ea1756 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -5,6 +5,7 @@
 config SCSI_AIC79XX
 	tristate "Adaptec AIC79xx U320 support"
 	depends on PCI && SCSI
+	select SCSI_SPI_ATTRS
 	help
 	This driver supports all of Adaptec's Ultra 320 PCI-X
 	based SCSI controllers.
@@ -21,12 +22,12 @@ config AIC79XX_CMDS_PER_DEVICE
 	to be used for any device.  The aic7xxx driver will automatically
 	vary this number based on device behavior.  For devices with a
 	fixed maximum, the driver will eventually lock to this maximum
-	and display a console message inidicating this value.
+	and display a console message indicating this value.
 
 	Due to resource allocation issues in the Linux SCSI mid-layer, using
 	a high number of commands per device may result in memory allocation
 	failures when many devices are attached to the system.  For this reason,
-	the default is set to 32.  Higher values may result in higer performance
+	the default is set to 32.  Higher values may result in higher performance
 	on some devices.  The upper bound is 253.  0 disables tagged queueing.
 
 	Per device tag depth can be controlled via the kernel command line
@@ -36,17 +37,17 @@ 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"
-	depends on SCSI_AIC79XX
+	depends on SCSI_AIC79XX && !PREVENT_FIRMWARE_BUILD
 	help
 	This option should only be enabled if you are modifying the firmware
 	source to the aic79xx driver and wish to have the generated firmware