Merge branches 'release' and 'ppc-workaround' into release

[linux-2.6] / include / asm-arm / arch-s3c2410 / dma.h

diff --git a/include/asm-arm/arch-s3c2410/dma.h b/include/asm-arm/arch-s3c2410/dma.h
index c6e8d8f64938e4e3aa0af3fb6119ec47ae8202ee..4f291d9b7d938a04c66c6ac8033a8fc9ffd7801c 100644 (file)
--- a/include/asm-arm/arch-s3c2410/dma.h
+++ b/include/asm-arm/arch-s3c2410/dma.h
@@ -214,6 +214,7 @@ struct s3c2410_dma_chan {
        unsigned long            dev_addr;
        unsigned long            load_timeout;
        unsigned int             flags;         /* channel flags */
+       unsigned int             hw_cfg;        /* last hw config */
 
        struct s3c24xx_dma_map  *map;           /* channel hw maps */