[SCSI] add failure return to scsi_init_shared_tag_map()

[linux-2.6] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index a480a37..c8c6065 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -209,7 +209,7 @@ config SCSI_LOGGING
          there should be no noticeable performance impact as long as you have
          logging turned off.
 
-menu "SCSI Transport Attributes"
+menu "SCSI Transports"
        depends on SCSI
 
 config SCSI_SPI_ATTRS
@@ -242,6 +242,8 @@ config SCSI_SAS_ATTRS
          If you wish to export transport-specific information about
          each attached SAS device to sysfs, say Y.
 
+source "drivers/scsi/libsas/Kconfig"
+
 endmenu
 
 menu "SCSI low-level drivers"
@@ -431,6 +433,7 @@ config SCSI_AIC7XXX_OLD
          module will be called aic7xxx_old.
 
 source "drivers/scsi/aic7xxx/Kconfig.aic79xx"
+source "drivers/scsi/aic94xx/Kconfig"
 
 # All the I2O code and drivers do not seem to be 64bit safe.
 config SCSI_DPT_I2O
@@ -469,6 +472,20 @@ config SCSI_IN2000
          To compile this driver as a module, choose M here: the
          module will be called in2000.
 
+config SCSI_ARCMSR
+       tristate "ARECA ARC11X0[PCI-X]/ARC12X0[PCI-EXPRESS] SATA-RAID support"
+       depends on PCI && SCSI
+       help
+         This driver supports all of ARECA's SATA RAID controller cards.
+         This is an ARECA-maintained driver by Erich Chen.
+         If you have any problems, please mail to: < erich@areca.com.tw >
+         Areca supports Linux RAID config tools.
+
+         < http://www.areca.com.tw >
+
+         To compile this driver as a module, choose M here: the
+         module will be called arcmsr (modprobe arcmsr).
+
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 
 config SCSI_SATA
@@ -501,7 +518,7 @@ config SCSI_ATA_PIIX
        tristate "Intel PIIX/ICH SATA support"
        depends on SCSI_SATA && PCI
        help
-         This option enables support for ICH5 Serial ATA.
+         This option enables support for ICH5/6/7/8 Serial ATA.
          If PATA support was enabled previously, this enables
          support for select Intel PIIX/ICH PATA host controllers.
 
@@ -532,6 +549,16 @@ config SCSI_PDC_ADMA
 
          If unsure, say N.
 
+config SCSI_HPTIOP
+       tristate "HighPoint RocketRAID 3xxx Controller support"
+       depends on SCSI && PCI
+       help
+         This option enables support for HighPoint RocketRAID 3xxx
+         controllers.
+
+         To compile this driver as a module, choose M here; the module
+         will be called hptiop. If unsure, say N.
+
 config SCSI_SATA_QSTOR
        tristate "Pacific Digital SATA QStor support"
        depends on SCSI_SATA && PCI
@@ -1043,6 +1070,13 @@ config 53C700_LE_ON_BE
        depends on SCSI_LASI700
        default y
 
+config SCSI_STEX
+       tristate "Promise SuperTrak EX Series support"
+       depends on PCI && SCSI
+       ---help---
+         This driver supports Promise SuperTrak EX8350/8300/16350/16300
+         Storage controllers.
+
 config SCSI_SYM53C8XX_2
        tristate "SYM53C8XX Version 2 SCSI support"
        depends on PCI && SCSI
@@ -1159,7 +1193,7 @@ config SCSI_NCR_Q720
          you do not have this SCSI card, so say N.
 
 config SCSI_NCR53C8XX_DEFAULT_TAGS
-       int "  default tagged command queue depth"
+       int "default tagged command queue depth"
        depends on SCSI_ZALON || SCSI_NCR_Q720
        default "8"
        ---help---
@@ -1185,7 +1219,7 @@ config SCSI_NCR53C8XX_DEFAULT_TAGS
          There is no safe option other than using good SCSI devices.
 
 config SCSI_NCR53C8XX_MAX_TAGS
-       int "  maximum number of queued commands"
+       int "maximum number of queued commands"
        depends on SCSI_ZALON || SCSI_NCR_Q720
        default "32"
        ---help---
@@ -1202,7 +1236,7 @@ config SCSI_NCR53C8XX_MAX_TAGS
          There is no safe option and the default answer is recommended.
 
 config SCSI_NCR53C8XX_SYNC
-       int "  synchronous transfers frequency in MHz"
+       int "synchronous transfers frequency in MHz"
        depends on SCSI_ZALON || SCSI_NCR_Q720
        default "20"
        ---help---
@@ -1236,7 +1270,7 @@ config SCSI_NCR53C8XX_SYNC
          terminations and SCSI conformant devices.
 
 config SCSI_NCR53C8XX_PROFILE
-       bool "  enable profiling"
+       bool "enable profiling"
        depends on SCSI_ZALON || SCSI_NCR_Q720
        help
          This option allows you to enable profiling information gathering.
@@ -1247,7 +1281,7 @@ config SCSI_NCR53C8XX_PROFILE
          The normal answer therefore is N.
 
 config SCSI_NCR53C8XX_NO_DISCONNECT
-       bool "  not allow targets to disconnect"
+       bool "not allow targets to disconnect"
        depends on (SCSI_ZALON || SCSI_NCR_Q720) && SCSI_NCR53C8XX_DEFAULT_TAGS=0
        help
          This option is only provided for safety if you suspect some SCSI