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 branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-mn10300
/
dma-mapping.h
diff --git
a/include/asm-mn10300/dma-mapping.h
b/include/asm-mn10300/dma-mapping.h
index 7c882fca9ec86cd056aa776782f4d2d8e15c01d0..ccae8f6c6326b17f6224ad1e555999a9c9cd5d5a 100644
(file)
--- a/
include/asm-mn10300/dma-mapping.h
+++ b/
include/asm-mn10300/dma-mapping.h
@@
-182,7
+182,7
@@
void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
}
static inline
-int dma_mapping_error(dma_addr_t dma_addr)
+int dma_mapping_error(
struct device *dev,
dma_addr_t dma_addr)
{
return 0;
}