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/arm64/mm/init.c | |
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/arm64/mm/init.c')
-rw-r--r-- | arch/arm64/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index f1c75957ff3c..1b591ddb28b0 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -21,8 +21,7 @@ #include <linux/of.h> #include <linux/of_fdt.h> #include <linux/dma-direct.h> -#include <linux/dma-mapping.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/efi.h> #include <linux/swiotlb.h> #include <linux/vmalloc.h> |