1 files changed, 34 insertions, 7 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 1c94b43d2c9b..3747457fee7a 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -41,12 +41,12 @@ config SATA_SVW
           If unsure, say N.
 
 config ATA_PIIX
-        tristate "Intel PIIX/ICH SATA support"
+        tristate "Intel ESB, ICH, PIIX3, PIIX4 PATA/SATA support"
         depends on PCI
         help
           This option enables support for ICH5/6/7/8 Serial ATA
-          and support for PATA on the Intel PIIX3/PIIX4/ICH series
-          PATA host controllers.
+          and support for PATA on the Intel ESB/ICH/PIIX3/PIIX4 series
+          host controllers.
 
           If unsure, say N.
 
@@ -116,11 +116,14 @@ config SATA_SIL24
           If unsure, say N.
 
 config SATA_SIS
-        tristate "SiS 964/180 SATA support"
+        tristate "SiS 964/965/966/180 SATA support"
         depends on PCI
+        select PATA_SIS
         help
-          This option enables support for SiS Serial ATA 964/180.
-
+          This option enables support for SiS Serial ATA on 
+          SiS 964/965/966/180 and Parallel ATA on SiS 180.
+          The PATA support for SiS 180 requires additionally to
+          enable the PATA_SIS driver in the config.
           If unsure, say N.
 
 config SATA_ULI
@@ -147,6 +150,12 @@ config SATA_VITESSE
 
           If unsure, say N.
 
+config SATA_INIC162X
+        tristate "Initio 162x SATA support (HIGHLY EXPERIMENTAL)"
+        depends on PCI && EXPERIMENTAL
+        help
+          This option enables support for Initio 162x Serial ATA.
+
 config SATA_INTEL_COMBINED
         bool
         depends on IDE=y && !BLK_DEV_IDE_SATA && (SATA_AHCI || ATA_PIIX)
@@ -296,7 +305,7 @@ config PATA_ISAPNP
           If unsure, say N.
 
 config PATA_IT821X
-        tristate "IT821x PATA support (Experimental)"
+        tristate "IT8211/2 PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the ITE 8211 and 8212
@@ -305,6 +314,15 @@ config PATA_IT821X
 
           If unsure, say N.
 
+config PATA_IT8213
+        tristate "IT8213 PATA support (Experimental)"
+        depends on PCI && EXPERIMENTAL
+        help
+          This option enables support for the ITE 821 PATA
+          controllers via the new ATA layer.
+
+          If unsure, say N.
+
 config PATA_JMICRON
         tristate "JMicron PATA support"
         depends on PCI
@@ -341,6 +359,15 @@ config PATA_MARVELL
 
           If unsure, say N.
 
+config PATA_MPC52xx
+        tristate "Freescale MPC52xx SoC internal IDE"
+        depends on PPC_MPC52xx
+        help
+          This option enables support for integrated IDE controller
+          of the Freescale MPC52xx SoC.
+
+          If unsure, say N.
+
 config PATA_MPIIX
         tristate "Intel PATA MPIIX support"
         depends on PCI