Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[~andy/linux] / drivers / dma / fsldma.h

diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
index 113e7134010b93eb20de62da77fa3d41079e4b11..9cb5aa57c677ea982339a87bc21df0a8e4d679e0 100644 (file)
--- a/drivers/dma/fsldma.h
+++ b/drivers/dma/fsldma.h
@@ -102,8 +102,8 @@ struct fsl_desc_sw {
 } __attribute__((aligned(32)));
 
 struct fsldma_chan_regs {
-       u32 mr; /* 0x00 - Mode Register */
-       u32 sr; /* 0x04 - Status Register */
+       u32 mr;         /* 0x00 - Mode Register */
+       u32 sr;         /* 0x04 - Status Register */
        u64 cdar;       /* 0x08 - Current descriptor address register */
        u64 sar;        /* 0x10 - Source Address Register */
        u64 dar;        /* 0x18 - Destination Address Register */
@@ -148,6 +148,7 @@ struct fsldma_chan {
        int id;                         /* Raw id of this channel */
        struct tasklet_struct tasklet;
        u32 feature;
+       bool idle;                      /* DMA controller is idle */
 
        void (*toggle_ext_pause)(struct fsldma_chan *fsl_chan, int enable);
        void (*toggle_ext_start)(struct fsldma_chan *fsl_chan, int enable);