Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 8cc7b3b..b94c217 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -201,12 +201,12 @@ config SCSI_ENCLOSURE
          certain enclosure conditions to be reported and is not required.
 
 config SCSI_CONSTANTS
-       bool "Verbose SCSI error reporting (kernel size +=12K)"
+       bool "Verbose SCSI error reporting (kernel size +=75K)"
        depends on SCSI
        help
          The error messages regarding your SCSI hardware will be easier to
          understand if you say Y here; it will enlarge your kernel by about
-         12 KB. If in doubt, say Y.
+         75 KB. If in doubt, say Y.
 
 config SCSI_LOGGING
        bool "SCSI logging facility"
@@ -1341,13 +1341,15 @@ config SCSI_DC395x
          To compile this driver as a module, choose M here: the
          module will be called dc395x.
 
-config SCSI_DC390T
-       tristate "Tekram DC390(T) and Am53/79C974 SCSI support"
+config SCSI_AM53C974
+       tristate "Tekram DC390(T) and Am53/79C974 SCSI support (new driver)"
        depends on PCI && SCSI
+       select SCSI_SPI_ATTRS
        ---help---
          This driver supports PCI SCSI host adapters based on the Am53C974A
          chip, e.g. Tekram DC390(T), DawiControl 2974 and some onboard
          PCscsi/PCnet (Am53/79C974) solutions.
+         This is a new implementation base on the generic esp_scsi driver.
 
          Documentation can be found in <file:Documentation/scsi/tmscsim.txt>.
 
@@ -1355,7 +1357,7 @@ config SCSI_DC390T
          based on NCR/Symbios chips. Use "NCR53C8XX SCSI support" for those.
 
          To compile this driver as a module, choose M here: the
-         module will be called tmscsim.
+         module will be called am53c974.
 
 config SCSI_T128
        tristate "Trantor T128/T128F/T228 SCSI support"
@@ -1451,19 +1453,26 @@ config SCSI_NSP32
          To compile this driver as a module, choose M here: the
          module will be called nsp32.
 
+config SCSI_WD719X
+       tristate "Western Digital WD7193/7197/7296 support"
+       depends on PCI && SCSI
+       select EEPROM_93CX6
+       ---help---
+         This is a driver for Western Digital WD7193, WD7197 and WD7296 PCI
+         SCSI controllers (based on WD33C296A chip).
+
 config SCSI_DEBUG
-       tristate "SCSI debugging host simulator"
+       tristate "SCSI debugging host and device simulator"
        depends on SCSI
        select CRC_T10DIF
        help
-         This is a host adapter simulator that can simulate multiple hosts
-         each with multiple dummy SCSI devices (disks). It defaults to one
-         host adapter with one dummy SCSI disk. Each dummy disk uses kernel
-         RAM as storage (i.e. it is a ramdisk). To save space when multiple
-         dummy disks are simulated, they share the same kernel RAM for 
-         their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more
-         information. This driver is primarily of use to those testing the
-         SCSI and block subsystems. If unsure, say N.
+         This pseudo driver simulates one or more hosts (SCSI initiators),
+         each with one or more targets, each with one or more logical units.
+         Defaults to one of each, creating a small RAM disk device. Many
+         parameters found in the /sys/bus/pseudo/drivers/scsi_debug
+         directory can be tweaked at run time.
+         See <http://sg.danny.cz/sg/sdebug26.html> for more information.
+         Mainly used for testing and best as a module. If unsure, say N.
 
 config SCSI_MESH
        tristate "MESH (Power Mac internal SCSI) support"
@@ -1615,7 +1624,7 @@ config ATARI_SCSI_RESET_BOOT
          that leave the devices with SCSI operations partway completed.
 
 config MAC_SCSI
-       bool "Macintosh NCR5380 SCSI"
+       tristate "Macintosh NCR5380 SCSI"
        depends on MAC && SCSI=y
        select SCSI_SPI_ATTRS
        help