serial: fix serial_match_port() for dynamic major tty-device numbers

[linux-2.6] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index c46b7c219ee92987b59386adbaa791b167aa28df..6239c3df30ac53fd877e4779c721068568556e1d 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -4,7 +4,8 @@
 
 menuconfig DMADEVICES
        bool "DMA Engine support"
 
 menuconfig DMADEVICES
        bool "DMA Engine support"

-       depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX
+       depends on (PCI && X86) || ARCH_IOP32X || ARCH_IOP33X || ARCH_IOP13XX || PPC
+       depends on !HIGHMEM64G

        help
          DMA engines can do asynchronous data transfers without
          involving the host CPU.  Currently, this framework can be
        help
          DMA engines can do asynchronous data transfers without
          involving the host CPU.  Currently, this framework can be


@@ -36,6 +37,15 @@ config INTEL_IOP_ADMA
        help
          Enable support for the Intel(R) IOP Series RAID engines.
 
        help
          Enable support for the Intel(R) IOP Series RAID engines.
 

+config FSL_DMA
+       bool "Freescale MPC85xx/MPC83xx DMA support"
+       depends on PPC
+       select DMA_ENGINE
+       ---help---
+         Enable support for the Freescale DMA engine. Now, it support
+         MPC8560/40, MPC8555, MPC8548 and MPC8641 processors.
+         The MPC8349, MPC8360 is also supported.
+

 config DMA_ENGINE
        bool
 
 config DMA_ENGINE
        bool