Merge branch 'master' into next

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / aic7xxx / Kconfig.aic7xxx

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index ac8de03c9fa2b6f4b0e99f6708c0772743145410..88da670a7915bee0ecdda3cfbafc942512da7dd8 100644 (file)
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -27,12 +27,12 @@ config AIC7XXX_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
@@ -42,23 +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)
-
-config AIC7XXX_PROBE_EISA_VL
-       bool "Probe for EISA and VL AIC7XXX Adapters"
-       depends on SCSI_AIC7XXX && EISA
-       help
-       Probe for EISA and VLB Aic7xxx controllers.  In many newer systems,
-       the invasive probes necessary to detect these controllers can cause
-       other devices to fail.  For this reason, the non-PCI probe code is
-       disabled by default.  The current value of this option can be "toggled"
-       via the no_probe kernel command line option.
+       Default: 5000 (5 seconds)
 
 config AIC7XXX_BUILD_FIRMWARE
        bool "Build Adapter Firmware with Kernel Build"
@@ -86,7 +76,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.