Merge ../linux-2.6

[pandora-kernel.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4c42065..44728ae 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -379,6 +379,14 @@ 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"
 
@@ -438,7 +446,9 @@ config SCSI_DPT_I2O
 
 config SCSI_ADVANSYS
        tristate "AdvanSys SCSI support"
-       depends on (ISA || EISA || PCI) && SCSI && BROKEN
+       depends on SCSI
+       depends on ISA || EISA || PCI
+       depends on BROKEN || X86_32
        help
          This is a driver for all SCSI host adapters manufactured by
          AdvanSys. It is documented in the kernel source in
@@ -522,6 +532,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
@@ -587,10 +607,10 @@ config SCSI_SATA_VIA
          If unsure, say N.
 
 config SCSI_SATA_VITESSE
-       tristate "VITESSE VSC-7174 SATA support"
+       tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"
        depends on SCSI_SATA && PCI
        help
-         This option enables support for Vitesse VSC7174 Serial ATA.
+         This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.
 
          If unsure, say N.
 
@@ -914,7 +934,7 @@ config SCSI_INIA100
 
 config SCSI_PPA
        tristate "IOMEGA parallel port (ppa - older drives)"
-       depends on SCSI && PARPORT
+       depends on SCSI && PARPORT_PC
        ---help---
          This driver supports older versions of IOMEGA's parallel port ZIP
          drive (a 100 MB removable media device).
@@ -941,7 +961,7 @@ config SCSI_PPA
 
 config SCSI_IMM
        tristate "IOMEGA parallel port (imm - newer drives)"
-       depends on SCSI && PARPORT
+       depends on SCSI && PARPORT_PC
        ---help---
          This driver supports newer versions of IOMEGA's parallel port ZIP
          drive (a 100 MB removable media device).
@@ -968,7 +988,7 @@ config SCSI_IMM
 
 config SCSI_IZIP_EPP16
        bool "ppa/imm option - Use slow (but safe) EPP-16"
-       depends on PARPORT && (SCSI_PPA || SCSI_IMM)
+       depends on SCSI_PPA || SCSI_IMM
        ---help---
          EPP (Enhanced Parallel Port) is a standard for parallel ports which
          allows them to act as expansion buses that can handle up to 64
@@ -983,7 +1003,7 @@ config SCSI_IZIP_EPP16
 
 config SCSI_IZIP_SLOW_CTR
        bool "ppa/imm option - Assume slow parport control register"
-       depends on PARPORT && (SCSI_PPA || SCSI_IMM)
+       depends on SCSI_PPA || SCSI_IMM
        help
          Some parallel ports are known to have excessive delays between
          changing the parallel port control register and good data being
@@ -1071,7 +1091,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
@@ -1082,7 +1102,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
@@ -1091,13 +1111,14 @@ 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_IOMAPPED
-       bool "use port IO"
+config SCSI_SYM53C8XX_MMIO
+       bool "Use memory mapped IO"
        depends on SCSI_SYM53C8XX_2
+       default y
        help
-         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.
+         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.
 
 config SCSI_IPR
        tristate "IBM Power Linux RAID adapter support"
@@ -1301,15 +1322,6 @@ 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
@@ -1815,7 +1827,7 @@ config SCSI_SUNESP
 
 config ZFCP
        tristate "FCP host bus adapter driver for IBM eServer zSeries"
-       depends on ARCH_S390 && QDIO && SCSI
+       depends on S390 && QDIO && SCSI
        select SCSI_FC_ATTRS
        help
           If you want to access SCSI devices attached to your IBM eServer