Merge tag 'pm+acpi-3.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[mirror_ubuntu-hirsute-kernel.git] / drivers / dma / dw / regs.h

diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h
index deb4274f80f41b9e1a5ed9ba6db9e21bc37d0687..bb98d3e91e8b2a6a656ba58bc31739c620e4c75a 100644 (file)
--- a/drivers/dma/dw/regs.h
+++ b/drivers/dma/dw/regs.h
@@ -252,13 +252,13 @@ struct dw_dma {
        struct tasklet_struct   tasklet;
        struct clk              *clk;
 
+       /* channels */
+       struct dw_dma_chan      *chan;
        u8                      all_chan_mask;
 
        /* hardware configuration */
        unsigned char           nr_masters;
        unsigned char           data_width[4];
-
-       struct dw_dma_chan      chan[0];
 };
 
 static inline struct dw_dma_regs __iomem *__dw_regs(struct dw_dma *dw)