Merge HEAD from ../scsi-misc-2.6-old

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c76a3b8..78c3318 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -235,6 +235,13 @@ config SCSI_ISCSI_ATTRS
          each attached iSCSI device to sysfs, say Y.
          Otherwise, say N.
 
+config SCSI_SAS_ATTRS
+       tristate "SAS Transport Attributes"
+       depends on SCSI
+       help
+         If you wish to export transport-specific information about
+         each attached SAS device to sysfs, say Y.
+
 endmenu
 
 menu "SCSI low-level drivers"
@@ -506,11 +513,11 @@ config SCSI_SATA_NV
 
          If unsure, say N.
 
-config SCSI_SATA_PROMISE
-       tristate "Promise SATA TX2/TX4 support"
+config SCSI_PDC_ADMA
+       tristate "Pacific Digital ADMA support"
        depends on SCSI_SATA && PCI
        help
-         This option enables support for Promise Serial ATA TX2/TX4.
+         This option enables support for Pacific Digital ADMA controllers
 
          If unsure, say N.
 
@@ -522,6 +529,14 @@ config SCSI_SATA_QSTOR
 
          If unsure, say N.
 
+config SCSI_SATA_PROMISE
+       tristate "Promise SATA TX2/TX4 support"
+       depends on SCSI_SATA && PCI
+       help
+         This option enables support for Promise Serial ATA TX2/TX4.
+
+         If unsure, say N.
+
 config SCSI_SATA_SX4
        tristate "Promise SATA SX4 support"
        depends on SCSI_SATA && PCI && EXPERIMENTAL
@@ -538,6 +553,14 @@ config SCSI_SATA_SIL
 
          If unsure, say N.
 
+config SCSI_SATA_SIL24
+       tristate "Silicon Image 3124/3132 SATA support"
+       depends on SCSI_SATA && PCI && EXPERIMENTAL
+       help
+         This option enables support for Silicon Image 3124/3132 Serial ATA.
+
+         If unsure, say N.
+
 config SCSI_SATA_SIS
        tristate "SiS 964/180 SATA support"
        depends on SCSI_SATA && PCI && EXPERIMENTAL
@@ -570,6 +593,11 @@ config SCSI_SATA_VITESSE
 
          If unsure, say N.
 
+config SCSI_SATA_INTEL_COMBINED
+       bool
+       depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
+       default y
+
 config SCSI_BUSLOGIC
        tristate "BusLogic SCSI support"
        depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API