diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-09-11 11:56:52 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-10-06 08:07:04 +0300 |
| commit | 0b1abd1fb7efafc25231c54a67c6fbb3d3127efd (patch) | |
| tree | 1a3bd0b8188be13aa6294e14b3d54922fd88dbac /arch/csky/mm | |
| parent | 580a0cc9c3f662e0b10136bc8af1e672e472806f (diff) | |
| download | linux-0b1abd1fb7efafc25231c54a67c6fbb3d3127efd.tar.xz | |
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 'arch/csky/mm')
| -rw-r--r-- | arch/csky/mm/dma-mapping.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/csky/mm/dma-mapping.c b/arch/csky/mm/dma-mapping.c index 8f6571ae27c8..3d9ff26c4bb4 100644 --- a/arch/csky/mm/dma-mapping.c +++ b/arch/csky/mm/dma-mapping.c @@ -2,8 +2,7 @@ // Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. #include <linux/cache.h> -#include <linux/dma-mapping.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <linux/genalloc.h> #include <linux/highmem.h> |