pxamci: fix byte aligned DMA transfers

[linux-2.6] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 292aa9a0f02f8d5b3913bdc5dca00ab86fda641f..ae8494944c45dd54eb92f57f9651b86b6679f361 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -205,8 +205,8 @@ config SATA_VITESSE
          If unsure, say N.
 
 config SATA_INIC162X
          If unsure, say N.
 
 config SATA_INIC162X

-       tristate "Initio 162x SATA support (HIGHLY EXPERIMENTAL)"
-       depends on PCI && EXPERIMENTAL
+       tristate "Initio 162x SATA support"
+       depends on PCI

        help
          This option enables support for Initio 162x Serial ATA.
 
        help
          This option enables support for Initio 162x Serial ATA.
 


@@ -566,11 +566,11 @@ config PATA_RADISYS
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-config PATA_RB500
-       tristate "RouterBoard 500 PATA CompactFlash support"
-       depends on MIKROTIK_RB500
+config PATA_RB532
+       tristate "RouterBoard 532 PATA CompactFlash support"
+       depends on MIKROTIK_RB532

        help
        help

-         This option enables support for the RouterBoard 500
+         This option enables support for the RouterBoard 532

          PATA CompactFlash controller.
 
          If unsure, say N.
          PATA CompactFlash controller.
 
          If unsure, say N.


@@ -651,9 +651,17 @@ config PATA_WINBOND_VLB
          Support for the Winbond W83759A controller on Vesa Local Bus
          systems.
 
          Support for the Winbond W83759A controller on Vesa Local Bus
          systems.
 

+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"
 config PATA_PLATFORM
        tristate "Generic platform device PATA support"

-       depends on EMBEDDED || ARCH_RPC || PPC
+       depends on EMBEDDED || ARCH_RPC || PPC || HAVE_PATA_PLATFORM

        help
          This option enables support for generic directly connected ATA
          devices commonly found on embedded systems.
        help
          This option enables support for generic directly connected ATA
          devices commonly found on embedded systems.


@@ -697,6 +705,15 @@ config PATA_SCC
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+config PATA_SCH
+       tristate "Intel SCH PATA support"
+       depends on PCI
+       help
+         This option enables support for Intel SCH PATA on the Intel
+         SCH (US15W, US15L, UL11L) series host controllers.
+
+         If unsure, say N.
+

 config PATA_BF54X
        tristate "Blackfin 54x ATAPI support"
        depends on BF542 || BF548 || BF549
 config PATA_BF54X
        tristate "Blackfin 54x ATAPI support"
        depends on BF542 || BF548 || BF549