Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / scsi / aic7xxx / Kconfig.aic7xxx

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index 473a658..5517da5 100644 (file)
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -5,6 +5,7 @@
 config SCSI_AIC7XXX
        tristate "Adaptec AIC7xxx Fast -> U160 support (New Driver)"
        depends on (PCI || EISA) && SCSI
+       select SCSI_SPI_ATTRS
        ---help---
        This driver supports all of Adaptec's Fast through Ultra 160 PCI
        based SCSI controllers as well as the aic7770 based EISA and VLB
@@ -41,13 +42,13 @@ config AIC7XXX_CMDS_PER_DEVICE
 config AIC7XXX_RESET_DELAY_MS
        int "Initial bus reset delay in milli-seconds"
        depends on SCSI_AIC7XXX
-       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 AIC7XXX_PROBE_EISA_VL
        bool "Probe for EISA and VL AIC7XXX Adapters"
@@ -61,7 +62,7 @@ config AIC7XXX_PROBE_EISA_VL
 
 config AIC7XXX_BUILD_FIRMWARE
        bool "Build Adapter Firmware with Kernel Build"
-       depends on SCSI_AIC7XXX
+       depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD
        help
        This option should only be enabled if you are modifying the firmware
        source to the aic7xxx driver and wish to have the generated firmware
@@ -85,7 +86,7 @@ config AIC7XXX_DEBUG_MASK
         default "0"
         help
        Bit mask of debug options that is only valid if the
-       CONFIG_AIC7XXX_DEBUG_ENBLE option is enabled.  The bits in this mask
+       CONFIG_AIC7XXX_DEBUG_ENABLE option is enabled.  The bits in this mask
        are defined in the drivers/scsi/aic7xxx/aic7xxx.h - search for the
        variable ahc_debug in that file to find them.