Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index cf960bd1c00a89662c54ed54cf51f00b932b7b16..ba63619ae5df20623ec530cc6eb7188da0b0c1df 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -173,6 +173,24 @@ config SATA_INIC162X
        help
          This option enables support for Initio 162x Serial ATA.
 
+config PATA_ACPI
+       tristate "ACPI firmware driver for PATA"
+       depends on ATA_ACPI
+       help
+         This option enables an ACPI method driver which drives
+         motherboard PATA controller interfaces through the ACPI
+         firmware in the BIOS. This driver can sometimes handle
+         otherwise unsupported hardware.
+
+config SATA_FSL
+       tristate "Freescale 3.0Gbps SATA support"
+       depends on PPC_MPC837x
+       help
+         This option enables support for Freescale 3.0Gbps SATA controller.
+         It can be found on MPC837x and MPC8315.
+
+         If unsure, say N.
+
 config PATA_ALI
        tristate "ALi PATA support (Experimental)"
        depends on PCI && EXPERIMENTAL
@@ -263,6 +281,15 @@ config PATA_CS5535
 
          If unsure, say N.
 
+config PATA_CS5536
+       tristate "CS5536 PATA support (Experimental)"
+       depends on PCI && X86 && !X86_64 && EXPERIMENTAL
+       help
+         This option enables support for the AMD CS5536
+         companion chip used with the Geode LX processor family.
+
+         If unsure, say N.
+
 config PATA_CYPRESS
        tristate "Cypress CY82C693 PATA support (Very Experimental)"
        depends on PCI && EXPERIMENTAL
@@ -623,11 +650,4 @@ config PATA_BF54X
 
          If unsure, say N.
 
-config PATA_BF54X_DMA
-       bool "DMA mode"
-       depends on PATA_BF54X
-       default y
-       help
-         Enable DMA mode for Blackfin ATAPI controller.
-
 endif # ATA