Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla...

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

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 69ed77fcb71f9076213761b2a18025a16408d406..5e6620f8dabce82dacb8cba930f4936eca0c52f6 100644 (file)
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -22,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
@@ -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"
@@ -57,18 +57,6 @@ config AIC79XX_BUILD_FIRMWARE
        or modify the assembler Makefile or the files it includes if your
        build environment is different than that of the author.
 
-config AIC79XX_ENABLE_RD_STRM
-       bool "Enable Read Streaming for All Targets"
-       depends on SCSI_AIC79XX
-       default n
-       help
-       Read Streaming is a U320 protocol option that should enhance
-       performance.  Early U320 drive firmware actually performs slower
-       with read streaming enabled so it is disabled by default.  Read
-       Streaming can be configured in much the same way as tagged queueing
-       using the "rd_strm" command line option.  See
-       drivers/scsi/aic7xxx/README.aic79xx for details.
-
 config AIC79XX_DEBUG_ENABLE
        bool "Compile in Debugging Code"
        depends on SCSI_AIC79XX