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 'linus' into core/generic-dma-coherent
[cascardo/linux.git]
/
include
/
asm-arm
/
dma-mapping.h
diff --git
a/include/asm-arm/dma-mapping.h
b/include/asm-arm/dma-mapping.h
index
943f23b
..
45329fc
100644
(file)
--- a/
include/asm-arm/dma-mapping.h
+++ b/
include/asm-arm/dma-mapping.h
@@
-58,7
+58,7
@@
static inline int dma_is_consistent(struct device *dev, dma_addr_t handle)
/*
* DMA errors are defined by all-bits-set in the DMA address.
*/
-static inline int dma_mapping_error(dma_addr_t dma_addr)
+static inline int dma_mapping_error(
struct device *dev,
dma_addr_t dma_addr)
{
return dma_addr == ~0;
}