diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-21 16:42:50 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-21 16:42:50 -0500 |
| commit | 22b61a11fd4e6d7a48d694ce350331bebc0394ed (patch) | |
| tree | f4be46c8154f5094c248fcd9fdf644b236f591b3 /arch/arm/plat-mxc | |
| parent | 423145a5d4def58cff760809d48cfb21316d59a9 (diff) | |
| parent | fa4e998999322bc1b11d2c8b19b9fa2016fd1548 (diff) | |
Merge branch 'dma' into devel
Conflicts:
arch/arm/plat-mxc/dma-mx1-mx2.c
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/dma-mx1-mx2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/dma-mx1-mx2.c b/arch/arm/plat-mxc/dma-mx1-mx2.c index 2905ec758758..a9bab15f0fd0 100644 --- a/arch/arm/plat-mxc/dma-mx1-mx2.c +++ b/arch/arm/plat-mxc/dma-mx1-mx2.c | |||
| @@ -113,7 +113,7 @@ struct imx_dma_channel { | |||
| 113 | void (*err_handler) (int, void *, int errcode); | 113 | void (*err_handler) (int, void *, int errcode); |
| 114 | void (*prog_handler) (int, void *, struct scatterlist *); | 114 | void (*prog_handler) (int, void *, struct scatterlist *); |
| 115 | void *data; | 115 | void *data; |
| 116 | unsigned int dma_mode; | 116 | unsigned int dma_mode; |
| 117 | struct scatterlist *sg; | 117 | struct scatterlist *sg; |
| 118 | unsigned int resbytes; | 118 | unsigned int resbytes; |
| 119 | int dma_num; | 119 | int dma_num; |