linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 96a81cd..da70464 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -379,14 +379,6 @@ config SCSI_AHA1740
 config SCSI_AACRAID
        tristate "Adaptec AACRAID support"
        depends on SCSI && PCI
-       help
-         This driver supports a variety of Dell, HP, Adaptec, IBM and
-         ICP storage products. For a list of supported products, refer
-         to <file:Documentation/scsi/aacraid.txt>.
-
-         To compile this driver as a module, choose M here: the module
-         will be called aacraid.
-
 
 source "drivers/scsi/aic7xxx/Kconfig.aic7xxx"
 
@@ -501,7 +493,7 @@ config SCSI_ATA_PIIX
        tristate "Intel PIIX/ICH SATA support"
        depends on SCSI_SATA && PCI
        help
-         This option enables support for ICH5/6/7/8 Serial ATA.
+         This option enables support for ICH5 Serial ATA.
          If PATA support was enabled previously, this enables
          support for select Intel PIIX/ICH PATA host controllers.
 
@@ -607,10 +599,10 @@ config SCSI_SATA_VIA
          If unsure, say N.
 
 config SCSI_SATA_VITESSE
-       tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"
+       tristate "VITESSE VSC-7174 SATA support"
        depends on SCSI_SATA && PCI
        help
-         This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.
+         This option enables support for Vitesse VSC7174 Serial ATA.
 
          If unsure, say N.
 
@@ -1091,7 +1083,7 @@ config SCSI_SYM53C8XX_DMA_ADDRESSING_MODE
          memory using PCI DAC cycles.
 
 config SCSI_SYM53C8XX_DEFAULT_TAGS
-       int "Default tagged command queue depth"
+       int "default tagged command queue depth"
        depends on SCSI_SYM53C8XX_2
        default "16"
        help
@@ -1102,7 +1094,7 @@ config SCSI_SYM53C8XX_DEFAULT_TAGS
          exceed CONFIG_SCSI_SYM53C8XX_MAX_TAGS.
 
 config SCSI_SYM53C8XX_MAX_TAGS
-       int "Maximum number of queued commands"
+       int "maximum number of queued commands"
        depends on SCSI_SYM53C8XX_2
        default "64"
        help
@@ -1111,14 +1103,13 @@ config SCSI_SYM53C8XX_MAX_TAGS
          possible. The driver supports up to 256 queued commands per device.
          This value is used as a compiled-in hard limit.
 
-config SCSI_SYM53C8XX_MMIO
-       bool "Use memory mapped IO"
+config SCSI_SYM53C8XX_IOMAPPED
+       bool "use port IO"
        depends on SCSI_SYM53C8XX_2
-       default y
        help
-         Memory mapped IO is faster than Port IO.  Most people should
-         answer Y here, but some machines may have problems.  If you have
-         to answer N here, please report the problem to the maintainer.
+         If you say Y here, the driver will use port IO to access
+         the card.  This is significantly slower then using memory
+         mapped IO.  Most people should answer N.
 
 config SCSI_IPR
        tristate "IBM Power Linux RAID adapter support"
@@ -1169,7 +1160,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---
@@ -1195,7 +1186,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---
@@ -1212,7 +1203,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---
@@ -1246,7 +1237,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.
@@ -1257,7 +1248,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
@@ -1322,6 +1313,15 @@ config SCSI_QLOGIC_FAS
          To compile this driver as a module, choose M here: the
          module will be called qlogicfas.
 
+config SCSI_QLOGIC_FC
+       tristate "Qlogic ISP FC SCSI support"
+       depends on PCI && SCSI
+       help
+         This is a driver for the QLogic ISP2100 SCSI-FCP host adapter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called qlogicfc.
+
 config SCSI_QLOGIC_FC_FIRMWARE
        bool "Include loadable firmware in driver"
        depends on SCSI_QLOGIC_FC