diff options
author | Christoph Hellwig <hch@lst.de> | 2020-09-11 10:56:52 +0200 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2020-10-06 07:07:04 +0200 |
commit | 0b1abd1fb7efafc25231c54a67c6fbb3d3127efd (patch) | |
tree | 1a3bd0b8188be13aa6294e14b3d54922fd88dbac /drivers/dma-buf/heaps | |
parent | 580a0cc9c3f662e0b10136bc8af1e672e472806f (diff) | |
download | linux-stable-0b1abd1fb7efafc25231c54a67c6fbb3d3127efd.tar.gz linux-stable-0b1abd1fb7efafc25231c54a67c6fbb3d3127efd.tar.bz2 linux-stable-0b1abd1fb7efafc25231c54a67c6fbb3d3127efd.zip |
dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>
Merge dma-contiguous.h into dma-map-ops.h, after removing the comment
describing the contiguous allocator into kernel/dma/contigous.c.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/dma-buf/heaps')
-rw-r--r-- | drivers/dma-buf/heaps/cma_heap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c index 626cf7fd033a..e55384dc115b 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -10,7 +10,7 @@ #include <linux/device.h> #include <linux/dma-buf.h> #include <linux/dma-heap.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/err.h> #include <linux/errno.h> #include <linux/highmem.h> |