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

[karo-tx-linux.git] / arch / avr32 / mach-at32ap / at32ap700x.c

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 1d8b147282cf789498843c7817552d9959a46544..b4cb3bd89d8ace17f50b509101b0e2e2e82a176f 100644 (file)
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -603,18 +603,11 @@ static void __init genclk_init_parent(struct clk *clk)
        clk->parent = parent;
 }
 
-static struct dw_dma_platform_data dw_dmac0_data = {
-       .nr_channels    = 3,
-       .block_size     = 4095U,
-       .nr_masters     = 2,
-       .data_width     = { 2, 2 },
-};
-
 static struct resource dw_dmac0_resource[] = {
        PBMEM(0xff200000),
        IRQ(2),
 };
-DEFINE_DEV_DATA(dw_dmac, 0);
+DEFINE_DEV(dw_dmac, 0);
 DEV_CLK(hclk, dw_dmac0, hsb, 10);
 
 /* --------------------------------------------------------------------