Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

1 files changed, 19 insertions, 3 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 3ee9b8b33be0..9c9f162bd6ed 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -489,11 +489,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.
 
@@ -505,6 +505,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
@@ -521,6 +529,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