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 /arch/xtensa | |
| parent | 580a0cc9c3f662e0b10136bc8af1e672e472806f (diff) | |
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/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/pci-dma.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/mm/init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c index 17c4384f8495..790dbe022a07 100644 --- a/arch/xtensa/kernel/pci-dma.c +++ b/arch/xtensa/kernel/pci-dma.c @@ -11,7 +11,7 @@ * Joe Taylor <joe@tensilica.com, joetylr@yahoo.com> */ -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dma-noncoherent.h> #include <linux/dma-direct.h> #include <linux/gfp.h> diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index a05b306cf371..8079007842ac 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c @@ -26,7 +26,7 @@ #include <linux/nodemask.h> #include <linux/mm.h> #include <linux/of_fdt.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <asm/bootparam.h> #include <asm/page.h> |