summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/omap3isp/isp.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-11-02 12:24:03 -0700
committerTony Lindgren <tony@atomide.com>2012-11-20 10:04:29 -0800
commitc8d35c84f5494d8d294205b598f927a11fd41f34 (patch)
tree2a28d6147cc9a0790419d4a2b5ae8ff75919f4f6 /drivers/media/platform/omap3isp/isp.h
parent2f7702af64d6ae7ae8b7f6d5dca1bf8bdaf0ac1f (diff)
downloadtalos-op-linux-c8d35c84f5494d8d294205b598f927a11fd41f34.tar.gz
talos-op-linux-c8d35c84f5494d8d294205b598f927a11fd41f34.zip
ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
Looks like the iommu framework does not have generic functions exported for all the needs yet. The hardware specific functions are defined in files like intel-iommu.h and amd-iommu.h. Follow the same standard for omap-iommu.h. This is needed because we are removing plat and mach includes for ARM common zImage support. Further work should continue in the iommu framework context as only pure platform data will be communicated from arch/arm/*omap*/* code to the iommu framework. Cc: Ido Yariv <ido@wizery.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Omar Ramirez Luna <omar.luna@linaro.org> Cc: linux-media@vger.kernel.org Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Joerg Roedel <joro@8bytes.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.h')
-rw-r--r--drivers/media/platform/omap3isp/isp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
index 8be7487c326f..8d6866942b85 100644
--- a/drivers/media/platform/omap3isp/isp.h
+++ b/drivers/media/platform/omap3isp/isp.h
@@ -31,11 +31,9 @@
#include <media/v4l2-device.h>
#include <linux/device.h>
#include <linux/io.h>
+#include <linux/iommu.h>
#include <linux/platform_device.h>
#include <linux/wait.h>
-#include <linux/iommu.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
#include "ispstat.h"
#include "ispccdc.h"
OpenPOWER on IntegriCloud