projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
include
/
asm-frv
/
dma-mapping.h
diff --git
a/include/asm-frv/dma-mapping.h
b/include/asm-frv/dma-mapping.h
index 2e8966ca030d46cd4b7514a3a0c4589aeba667b7..b2898877c07b5048fb820fe1b5e1350a53ccf5fe 100644
(file)
--- a/
include/asm-frv/dma-mapping.h
+++ b/
include/asm-frv/dma-mapping.h
@@
-126,7
+126,7
@@
void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nele
}
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;
}