projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dma' into devel
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
plat-mxc
/
dma-mx1-mx2.c
diff --git
a/arch/arm/plat-mxc/dma-mx1-mx2.c
b/arch/arm/plat-mxc/dma-mx1-mx2.c
index
2905ec7
..
a9bab15
100644
(file)
--- 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 {
void (*err_handler) (int, void *, int errcode);
void (*prog_handler) (int, void *, struct scatterlist *);
void *data;
- unsigned int
dma_mode;
+ unsigned int dma_mode;
struct scatterlist *sg;
unsigned int resbytes;
int dma_num;