git.samba.org
/
sfrench
/
cifs-2.6.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
[sfrench/cifs-2.6.git]
/
include
/
asm-cris
/
dma-mapping.h
diff --git
a/include/asm-cris/dma-mapping.h
b/include/asm-cris/dma-mapping.h
index cb2fb25ff8d9dcb79729b6b0865193357b5eda7d..da8ef8e8f842733751a33985879e07057e6af523 100644
(file)
--- a/
include/asm-cris/dma-mapping.h
+++ b/
include/asm-cris/dma-mapping.h
@@
-14,6
+14,8
@@
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#ifdef CONFIG_PCI
+#include <asm-generic/dma-coherent.h>
+
void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag);