Merge branch 'topic/at_xdmac' into for-linus

diff --combined drivers/dma/Kconfig
index aef8b9dd4db6e4385cf1ef2a8d240242aa48df21,8b6fb0f110076926e9e05c5b8fad475059568990..f2b2c4e87aef40c93ea726d2a93b19f47a4584c7
--- 1/drivers/dma/Kconfig
--- 2/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -109,7 -109,7 +109,7 @@@ config AT_HDMA
  
  config AT_XDMAC
        tristate "Atmel XDMA support"
-       depends on (ARCH_AT91 || COMPILE_TEST)
+       depends on ARCH_AT91
        select DMA_ENGINE
        help
          Support the Atmel XDMA controller.
@@@ -402,12 -402,12 +402,12 @@@ config XILINX_VDM
  
  config DMA_SUN6I
        tristate "Allwinner A31 SoCs DMA support"
 -      depends on MACH_SUN6I || COMPILE_TEST
 +      depends on MACH_SUN6I || MACH_SUN8I || COMPILE_TEST
        depends on RESET_CONTROLLER
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
        help
 -        Support for the DMA engine for Allwinner A31 SoCs.
 +        Support for the DMA engine first found in Allwinner A31 SoCs.
  
  config NBPFAXI_DMA
        tristate "Renesas Type-AXI NBPF DMA support"