projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 461a694)
iommu: Remove trace-events include from iommu.h
authorJoerg Roedel <jroedel@suse.de>
Wed, 26 Apr 2017 13:49:57 +0000 (15:49 +0200)
committerJoerg Roedel <jroedel@suse.de>
Fri, 28 Apr 2017 22:20:50 +0000 (00:20 +0200)
It is not needed there anymore. All places needing it are
fixed.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/media/platform/mtk-vpu/mtk_vpu.c patch | blob | blame | history
include/linux/iommu.h patch | blob | blame | history

diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mtk-vpu/mtk_vpu.c
index 463b69c934bef04db809db84d665382591e75e80..e011c8dc019803c58fd28b14065df206bf7cd0cf 100644 (file)
--- a/drivers/media/platform/mtk-vpu/mtk_vpu.c
+++ b/drivers/media/platform/mtk-vpu/mtk_vpu.c
@@ -23,6 +23,7 @@
 #include <linux/of_reserved_mem.h>
 #include <linux/sched.h>
 #include <linux/sizes.h>
+#include <linux/dma-mapping.h>
 
 #include "mtk_vpu.h"
 
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index abaa0ca848bc1b748fbb6f4bd36840654de6c6fa..dda8717545e9acc30bbc6465d12ffa0e28d1daa9 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -26,8 +26,6 @@
 #include <linux/err.h>
 #include <linux/of.h>
 
-#include <trace/events/iommu.h>
-
 #define IOMMU_READ     (1 << 0)
 #define IOMMU_WRITE    (1 << 1)
 #define IOMMU_CACHE    (1 << 2) /* DMA cache coherency */