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 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
include
/
linux
/
dmaengine.h
diff --git
a/include/linux/dmaengine.h
b/include/linux/dmaengine.h
index
8cd00ad
..
9bebd7f
100644
(file)
--- a/
include/linux/dmaengine.h
+++ b/
include/linux/dmaengine.h
@@
-532,7
+532,7
@@
static inline int dmaengine_resume(struct dma_chan *chan)
return dmaengine_device_control(chan, DMA_RESUME, 0);
}
-static inline
in
t dmaengine_submit(struct dma_async_tx_descriptor *desc)
+static inline
dma_cookie_
t dmaengine_submit(struct dma_async_tx_descriptor *desc)
{
return desc->tx_submit(desc);
}