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
f41335b
..
45329fc
100644
(file)
--- a/
include/asm-arm/dma-mapping.h
+++ b/
include/asm-arm/dma-mapping.h
@@
-7,6
+7,8
@@
#include <linux/scatterlist.h>
+#include <asm-generic/dma-coherent.h>
+
/*
* DMA-consistent mapping functions. These allocate/free a region of
* uncached, unwrite-buffered mapped memory space for use with DMA