projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux...
[cascardo/linux.git]
/
include
/
asm-cris
/
dma-mapping.h
diff --git
a/include/asm-cris/dma-mapping.h
b/include/asm-cris/dma-mapping.h
index
edc8d1b
..
cb2fb25
100644
(file)
--- a/
include/asm-cris/dma-mapping.h
+++ b/
include/asm-cris/dma-mapping.h
@@
-120,7
+120,7
@@
dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
}
static inline int
-dma_mapping_error(dma_addr_t dma_addr)
+dma_mapping_error(
struct device *dev,
dma_addr_t dma_addr)
{
return 0;
}