Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 3f4aa0c99ee4dccaf096330732887bc5be153f79..1c94b43d2c9b0fd6696ce44fb7837953cd051500 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -6,6 +6,7 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 
 config ATA
        tristate "ATA device support"
+       depends on BLOCK
        depends on !(M32R || M68K) || BROKEN
        depends on !SUN4 || BROKEN
        select SCSI
@@ -18,6 +19,10 @@ config ATA
 
 if ATA
 
+config ATA_NONSTANDARD
+       bool
+       default n
+
 config SATA_AHCI
        tristate "AHCI SATA support"
        depends on PCI
@@ -39,9 +44,9 @@ config ATA_PIIX
        tristate "Intel PIIX/ICH SATA support"
        depends on PCI
        help
-         This option enables support for ICH5/6/7/8 Serial ATA.
-         If PATA support was enabled previously, this enables
-         support for select Intel PIIX/ICH PATA host controllers.
+         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.
 
          If unsure, say N.
 
@@ -327,6 +332,15 @@ config PATA_TRIFLEX
 
          If unsure, say N.
 
+config PATA_MARVELL
+       tristate "Marvell PATA support via legacy mode"
+       depends on PCI
+       help
+         This option enables limited support for the Marvell 88SE6145 ATA
+         controller.
+
+         If unsure, say N.
+
 config PATA_MPIIX
        tristate "Intel PATA MPIIX support"
        depends on PCI
@@ -371,7 +385,7 @@ config PATA_OPTI
          If unsure, say N.
 
 config PATA_OPTIDMA
-       tristate "OPTI FireStar PATA support (Veyr Experimental)"
+       tristate "OPTI FireStar PATA support (Very Experimental)"
        depends on PCI && EXPERIMENTAL
        help
          This option enables DMA/PIO support for the later OPTi
@@ -482,6 +496,32 @@ config PATA_WINBOND
 
          If unsure, say N.
 
+config PATA_WINBOND_VLB
+       tristate "Winbond W83759A VLB PATA support (Experimental)"
+       depends on ISA && EXPERIMENTAL
+       help
+         Support for the Winbond W83759A controller on Vesa Local Bus
+         systems.
+
+config PATA_PLATFORM
+       tristate "Generic platform device PATA support"
+       depends on EMBEDDED
+       help
+         This option enables support for generic directly connected ATA
+         devices commonly found on embedded systems.
+
+         If unsure, say N.
+
+config PATA_IXP4XX_CF
+       tristate "IXP4XX Compact Flash support"
+       depends on ARCH_IXP4XX
+       help
+         This option enables support for a Compact Flash connected on
+         the ixp4xx expansion bus. This driver had been written for
+         Loft/Avila boards in mind but can work with others.
+
+         If unsure, say N.
+
 endif
 endmenu