git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMAENGINE: extend the control command to include an arg
[safe/jmp/linux-2.6]
/
drivers
/
dma
/
dw_dmac.c
diff --git
a/drivers/dma/dw_dmac.c
b/drivers/dma/dw_dmac.c
index
18fb5b4
..
a3991ab
100644
(file)
--- a/
drivers/dma/dw_dmac.c
+++ b/
drivers/dma/dw_dmac.c
@@
-781,7
+781,8
@@
err_desc_get:
return NULL;
}
return NULL;
}
-static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd)
+static int dwc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
+ unsigned long arg)
{
struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
struct dw_dma *dw = to_dw_dma(chan->device);
{
struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
struct dw_dma *dw = to_dw_dma(chan->device);