From 2f7702af64d6ae7ae8b7f6d5dca1bf8bdaf0ac1f Mon Sep 17 00:00:00 2001 From: Ido Yariv Date: Fri, 2 Nov 2012 12:24:00 -0700 Subject: [PATCH] ARM: OMAP2+: Move iopgtable header to drivers/iommu/ The iopgtable header file is only used by the iommu & iovmm drivers, so move it to drivers/iommu/, as part of the single zImage effort. Cc: Laurent Pinchart Cc: Mauro Carvalho Chehab Cc: Omar Ramirez Luna Signed-off-by: Ido Yariv Acked-by: Ohad Ben-Cohen Acked-by: Joerg Roedel [tony@atomide.com: updated to be earlier in the series] Signed-off-by: Tony Lindgren --- drivers/iommu/omap-iommu-debug.c | 2 +- drivers/iommu/omap-iommu.c | 2 +- .../include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h | 0 drivers/iommu/omap-iovmm.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/plat-omap/include/plat/iopgtable.h => drivers/iommu/omap-iopgtable.h (100%) diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index f55fc5dfbadc..0cac372b0d43 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -22,7 +22,7 @@ #include #include -#include +#include "omap-iopgtable.h" #define MAXCOLUMN 100 /* for short messages */ diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index d0b1234581be..f2bbfb0fd0e0 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -26,7 +26,7 @@ #include -#include +#include "omap-iopgtable.h" #define for_each_iotlb_cr(obj, n, __i, cr) \ for (__i = 0; \ diff --git a/arch/arm/plat-omap/include/plat/iopgtable.h b/drivers/iommu/omap-iopgtable.h similarity index 100% rename from arch/arm/plat-omap/include/plat/iopgtable.h rename to drivers/iommu/omap-iopgtable.h diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c index 2e10c3e0a7ae..b332392397ce 100644 --- a/drivers/iommu/omap-iovmm.c +++ b/drivers/iommu/omap-iovmm.c @@ -24,7 +24,7 @@ #include #include -#include +#include "omap-iopgtable.h" static struct kmem_cache *iovm_area_cachep; -- 2.34.1