Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 36e2319264bd33d7918979105a4f641da36d3dcd..c2328aed08361c0e8a8caf97666935f17c953a0c 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -2,6 +2,14 @@
 # SATA/PATA driver configuration
 #
 
+config HAVE_PATA_PLATFORM
+       bool
+       help
+         This is an internal configuration node for any machine that
+         uses pata-platform driver to enable the relevant driver in the
+         configuration structure without having to submit endless patches
+         to update the PATA_PLATFORM entry.
+
 menuconfig ATA
        tristate "Serial ATA and Parallel ATA drivers"
        depends on HAS_IOMEM
@@ -90,6 +98,14 @@ config SATA_INIC162X
        help
          This option enables support for Initio 162x Serial ATA.
 
+config SATA_ACARD_AHCI
+       tristate "ACard AHCI variant (ATP 8620)"
+       depends on PCI
+       help
+         This option enables support for Acard.
+
+         If unsure, say N.
+
 config SATA_SIL24
        tristate "Silicon Image 3124/3132 SATA support"
        depends on PCI
@@ -400,11 +416,11 @@ config PATA_HPT37X
          If unsure, say N.
 
 config PATA_HPT3X2N
-       tristate "HPT 372N/302N PATA support"
+       tristate "HPT 371N/372N/302N PATA support"
        depends on PCI
        help
          This option enables support for the N variant HPT PATA
-         controllers via the new ATA layer
+         controllers via the new ATA layer.
 
          If unsure, say N.
 
@@ -765,17 +781,9 @@ config PATA_PCMCIA
 
          If unsure, say N.
 
-config HAVE_PATA_PLATFORM
-       bool
-       help
-         This is an internal configuration node for any machine that
-         uses pata-platform driver to enable the relevant driver in the
-         configuration structure without having to submit endless patches
-         to update the PATA_PLATFORM entry.
-
 config PATA_PLATFORM
        tristate "Generic platform device PATA support"
-       depends on EMBEDDED || PPC || HAVE_PATA_PLATFORM
+       depends on EXPERT || PPC || HAVE_PATA_PLATFORM
        help
          This option enables support for generic directly connected ATA
          devices commonly found on embedded systems.