Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[karo-tx-linux.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4035920ce3d8078c4aa33bfbfbbc87a2ecc1be96..96a81cd17617aaa95fe7bad50875488182f65081 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -446,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
@@ -499,7 +501,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.
 
@@ -530,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
@@ -1079,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
@@ -1090,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
@@ -1099,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"
@@ -1156,7 +1169,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---
@@ -1182,7 +1195,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---
@@ -1199,7 +1212,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---
@@ -1233,7 +1246,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.
@@ -1244,7 +1257,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
@@ -1309,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