git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/asoc' into for-linus
[pandora-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
..
e364a5e
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;
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;
struct scatterlist *sg;
unsigned int resbytes;
int dma_num;
@@
-802,7
+802,7
@@
static int __init imx_dma_init(void)
int ret = 0;
int i;
int ret = 0;
int i;
- dma_clk = clk_get(NULL, "dma
_clk
");
+ dma_clk = clk_get(NULL, "dma");
clk_enable(dma_clk);
/* reset DMA module */
clk_enable(dma_clk);
/* reset DMA module */