Merge branches 'master' and 'devel' into for-linus

[deliverable/linux.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 8fae6afd6a3d0db3484d050dd3e19027f48fb753..65e3e2708371962a3878061a8b71666230e80c2c 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -651,6 +651,17 @@ config PATA_VIA
 
          If unsure, say N.
 
+config PATA_PXA
+       tristate "PXA DMA-capable PATA support"
+       depends on ARCH_PXA
+       help
+         This option enables support for harddrive attached to PXA CPU's bus.
+
+         NOTE: This driver utilizes PXA DMA controller, in case your hardware
+               is not capable of doing MWDMA, use pata_platform instead.
+
+         If unsure, say N.
+
 config PATA_WINBOND
        tristate "Winbond SL82C105 PATA support"
        depends on PCI