Merge remote-tracking branch 'xen-tip/linux-next'

[karo-tx-linux.git] / arch / arm / mach-davinci / dm644x.c

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index aa3453b40d5f64761aac73bf5ea506f1cf2eeef0..d38f5049d56e02064a3208bf1403fdb7ea40c49c 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -545,6 +545,7 @@ static struct resource edma_resources[] = {
 static const struct platform_device_info dm644x_edma_device __initconst = {
        .name           = "edma",
        .id             = 0,
+       .dma_mask       = DMA_BIT_MASK(32),
        .res            = edma_resources,
        .num_res        = ARRAY_SIZE(edma_resources),
        .data           = &dm644x_edma_pdata,