diff options
| author | Christoph Hellwig | 2020-09-11 10:56:52 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2020-10-06 07:07:04 +0200 |
| commit | 0b1abd1fb7efafc25231c54a67c6fbb3d3127efd (patch) | |
| tree | 1a3bd0b8188be13aa6294e14b3d54922fd88dbac /arch/x86/kernel/setup.c | |
| 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/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 9286fa9d575e..e8155e85bd8f 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -7,7 +7,7 @@ */ #include <linux/console.h> #include <linux/crash_dump.h> -#include <linux/dma-contiguous.h> +#include <linux/dma-map-ops.h> #include <linux/dmi.h> #include <linux/efi.h> #include <linux/init_ohci1394_dma.h> |