projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-m68k
/
dma-mapping.h
diff --git
a/include/asm-m68k/dma-mapping.h
b/include/asm-m68k/dma-mapping.h
index a26cdeb46a575e2a0756ed8c4226fe64a4139a9c..91f7944333d49d6ce2f861036cddf0492ce76b9c 100644
(file)
--- a/
include/asm-m68k/dma-mapping.h
+++ b/
include/asm-m68k/dma-mapping.h
@@
-84,7
+84,7
@@
static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *s
{
}
-static inline int dma_mapping_error(dma_addr_t handle)
+static inline int dma_mapping_error(
struct device *dev,
dma_addr_t handle)
{
return 0;
}