diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-05-22 08:55:43 +0200 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-05-22 08:55:43 +0200 |
commit | 0f51596bd39a5c928307ffcffc9ba07f90f42a8b (patch) | |
tree | b636403815316ecad2170092b70f1079df260a95 /include/asm-generic | |
parent | 61f6c7a47a2f84b7ba4b65240ffe9247df772b06 (diff) | |
parent | 4ce63fcd919c32d22528e54dcd89506962933719 (diff) | |
download | linux-0f51596bd39a5c928307ffcffc9ba07f90f42a8b.tar.bz2 |
Merge branch 'for-next-arm-dma' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/dma-coherent.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-generic/dma-coherent.h b/include/asm-generic/dma-coherent.h index 85a3ffaa0242..abfb2682de7f 100644 --- a/include/asm-generic/dma-coherent.h +++ b/include/asm-generic/dma-coherent.h @@ -3,13 +3,15 @@ #ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT /* - * These two functions are only for dma allocator. + * These three functions are only for dma allocator. * Don't use them in device drivers. */ int dma_alloc_from_coherent(struct device *dev, ssize_t size, dma_addr_t *dma_handle, void **ret); int dma_release_from_coherent(struct device *dev, int order, void *vaddr); +int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma, + void *cpu_addr, size_t size, int *ret); /* * Standard interface */ |