diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-07-28 18:15:46 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-07-28 18:15:46 -0400 |
| commit | 756f7bc6683916177e8176f8d3fa5f4c11c88afc (patch) | |
| tree | cbe3ffc375950b016198fa61dea63bb449c59c93 /include/asm-arm | |
| parent | 979b1791e5b8f8b556faeec4c48339e7ed63af9f (diff) | |
| parent | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (diff) | |
Merge branch 'core/generic-dma-coherent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/dma-mapping.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/dma-mapping.h b/include/asm-arm/dma-mapping.h index f41335ba6337..45329fca1b64 100644 --- a/include/asm-arm/dma-mapping.h +++ b/include/asm-arm/dma-mapping.h | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/scatterlist.h> | 8 | #include <linux/scatterlist.h> |
| 9 | 9 | ||
| 10 | #include <asm-generic/dma-coherent.h> | ||
| 11 | |||
| 10 | /* | 12 | /* |
| 11 | * DMA-consistent mapping functions. These allocate/free a region of | 13 | * DMA-consistent mapping functions. These allocate/free a region of |
| 12 | * uncached, unwrite-buffered mapped memory space for use with DMA | 14 | * uncached, unwrite-buffered mapped memory space for use with DMA |