Merge commit 'v2.6.31-rc1' into dmaengine

diff --combined drivers/dma/Kconfig
index bc8fb41,070357a..81e1020
--- 1/drivers/dma/Kconfig
--- 2/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -4,7 -4,7 +4,7 @@@
  
  menuconfig DMADEVICES
        bool "DMA Engine support"
 -      depends on !HIGHMEM64G && HAS_DMA
 +      depends on HAS_DMA
        help
          DMA engines can do asynchronous data transfers without
          involving the host CPU.  Currently, this framework can be
@@@ -46,14 -46,6 +46,14 @@@ config DW_DMA
          Support the Synopsys DesignWare AHB DMA controller.  This
          can be integrated in chips such as the Atmel AT32ap7000.
  
 +config AT_HDMAC
 +      tristate "Atmel AHB DMA support"
 +      depends on ARCH_AT91SAM9RL
 +      select DMA_ENGINE
 +      help
 +        Support the Atmel AHB DMA controller.  This can be integrated in
 +        chips such as the Atmel AT91SAM9RL.
 +
  config FSL_DMA
        tristate "Freescale Elo and Elo Plus DMA support"
        depends on FSL_SOC
@@@ -89,6 -81,14 +89,14 @@@ config MX3_IPU_IRQ
          To avoid bloating the irq_desc[] array we allocate a sufficient
          number of IRQ slots and map them dynamically to specific sources.
  
+ config TXX9_DMAC
+       tristate "Toshiba TXx9 SoC DMA support"
+       depends on MACH_TX49XX || MACH_TX39XX
+       select DMA_ENGINE
+       help
+         Support the TXx9 SoC internal DMA controller.  This can be
+         integrated in chips such as the Toshiba TX4927/38/39.
+ 
  config DMA_ENGINE
        bool
  
@@@ -108,7 -108,7 +116,7 @@@ config NET_DM
  
  config ASYNC_TX_DMA
        bool "Async_tx: Offload support for the async_tx api"
 -      depends on DMA_ENGINE
 +      depends on DMA_ENGINE && !HIGHMEM64G
        help
          This allows the async_tx api to take advantage of offload engines for
          memcpy, memset, xor, and raid6 p+q operations.  If your platform has

diff --combined drivers/dma/Makefile
index d7bc5fd,a0b6564..40e1e00
--- 1/drivers/dma/Makefile
--- 2/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -7,5 -7,5 +7,6 @@@ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adm
  obj-$(CONFIG_FSL_DMA) += fsldma.o
  obj-$(CONFIG_MV_XOR) += mv_xor.o
  obj-$(CONFIG_DW_DMAC) += dw_dmac.o
 +obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
  obj-$(CONFIG_MX3_IPU) += ipu/
+ obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o