Merge branch 'for-3.11/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / arm / plat-iop / adma.c

diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c
index 1ff6a37e893c423da523a945e0cf7c5d8f837152..a4d1f8de3b5b23453ee4738723164a5ba8405424 100644 (file)
--- a/arch/arm/plat-iop/adma.c
+++ b/arch/arm/plat-iop/adma.c
@@ -192,12 +192,10 @@ static int __init iop3xx_adma_cap_init(void)
 
        #ifdef CONFIG_ARCH_IOP32X /* the 32x AAU does not perform zero sum */
        dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask);
-       dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask);
        dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask);
        #else
        dma_cap_set(DMA_XOR, iop3xx_aau_data.cap_mask);
        dma_cap_set(DMA_XOR_VAL, iop3xx_aau_data.cap_mask);
-       dma_cap_set(DMA_MEMSET, iop3xx_aau_data.cap_mask);
        dma_cap_set(DMA_INTERRUPT, iop3xx_aau_data.cap_mask);
        #endif