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 /drivers/media | |
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 'drivers/media')
-rw-r--r-- | drivers/media/platform/exynos4-is/fimc-is.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index a474014f0a0f..32f5982afa1a 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -12,7 +12,6 @@ #include <linux/device.h> #include <linux/debugfs.h> #include <linux/delay.h> -#include <linux/dma-contiguous.h> #include <linux/errno.h> #include <linux/firmware.h> #include <linux/interrupt.h> |