1 files changed, 24 insertions, 19 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 7bdbe5a914d0..365c306c7cf8 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -156,11 +156,6 @@ config SATA_INIC162X
         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)
-        default y
-
 config SATA_ACPI
         bool
         depends on ACPI && PCI
@@ -184,7 +179,7 @@ config PATA_ALI
           If unsure, say N.
 
 config PATA_AMD
-        tristate "AMD/NVidia PATA support (Experimental)"
+        tristate "AMD/NVidia PATA support"
         depends on PCI
         help
           This option enables support for the AMD and NVidia PATA
@@ -209,6 +204,16 @@ config PATA_ATIIXP
 
           If unsure, say N.
 
+config PATA_CMD640_PCI
+        tristate "CMD640 PCI PATA support (Very Experimental)"
+        depends on PCI && EXPERIMENTAL
+        help
+          This option enables support for the CMD640 PCI IDE
+          interface chip. Only the primary channel is currently
+          supported.
+
+          If unsure, say N.
+
 config PATA_CMD64X
         tristate "CMD64x PATA support (Very Experimental)"
         depends on PCI&& EXPERIMENTAL
@@ -273,7 +278,7 @@ config ATA_GENERIC
           If unsure, say N.
 
 config PATA_HPT366
-        tristate "HPT 366/368 PATA support (Very Experimental)"
+        tristate "HPT 366/368 PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the HPT 366 and 368
@@ -282,7 +287,7 @@ config PATA_HPT366
           If unsure, say N.
 
 config PATA_HPT37X
-        tristate "HPT 370/370A/371/372/374/302 PATA support (Very Experimental)"
+        tristate "HPT 370/370A/371/372/374/302 PATA support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the majority of the later HPT
@@ -309,7 +314,7 @@ config PATA_HPT3X3
           If unsure, say N.
 
 config PATA_ISAPNP
-        tristate "ISA Plug and Play PATA support (Very Experimental)"
+        tristate "ISA Plug and Play PATA support (Experimental)"
         depends on EXPERIMENTAL && ISAPNP
         help
           This option enables support for ISA plug & play ATA
@@ -318,8 +323,8 @@ config PATA_ISAPNP
           If unsure, say N.
 
 config PATA_IT821X
-        tristate "IT8211/2 PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        tristate "IT8211/2 PATA support"
+        depends on PCI
         help
           This option enables support for the ITE 8211 and 8212
           PATA controllers via the new ATA layer, including RAID
@@ -390,10 +395,10 @@ config PATA_MPIIX
           If unsure, say N.
 
 config PATA_OLDPIIX
-        tristate "Intel PATA old PIIX support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        tristate "Intel PATA old PIIX support"
+        depends on PCI
         help
-          This option enables support for old(?) PIIX PATA support.
+          This option enables support for early PIIX PATA support.
 
           If unsure, say N.
 
@@ -444,7 +449,7 @@ config PATA_PCMCIA
           If unsure, say N.
 
 config PATA_PDC_OLD
-        tristate "Older Promise PATA controller support (Very Experimental)"
+        tristate "Older Promise PATA controller support (Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the Promise 20246, 20262, 20263,
@@ -459,7 +464,7 @@ config PATA_QDI
           Support for QDI 6500 and 6580 PATA controllers on VESA local bus.
 
 config PATA_RADISYS
-        tristate "RADISYS 82600 PATA support (Very experimental)"
+        tristate "RADISYS 82600 PATA support (Very Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the RADISYS 82600
@@ -477,7 +482,7 @@ config PATA_RZ1000
           If unsure, say N.
 
 config PATA_SC1200
-        tristate "SC1200 PATA support (Raving Lunatic)"
+        tristate "SC1200 PATA support (Very Experimental)"
         depends on PCI && EXPERIMENTAL
         help
           This option enables support for the NatSemi/AMD SC1200 SoC
@@ -486,8 +491,8 @@ config PATA_SC1200
           If unsure, say N.
 
 config PATA_SERVERWORKS
-        tristate "SERVERWORKS OSB4/CSB5/CSB6/HT1000 PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        tristate "SERVERWORKS OSB4/CSB5/CSB6/HT1000 PATA support"
+        depends on PCI
         help
           This option enables support for the Serverworks OSB4/CSB5/CSB6 and
           HT1000 PATA controllers, via the new ATA layer.