diff options
| author | Ido Yariv <ido@wizery.com> | 2012-11-02 20:24:00 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-20 19:04:17 +0100 |
| commit | 2f7702af64d6ae7ae8b7f6d5dca1bf8bdaf0ac1f (patch) | |
| tree | fe291fa5a0154a4d6a19a8cc2b2d3a814ab91105 | |
| parent | ARM: OMAP: Merge iommu2.h into iommu.h (diff) | |
| download | linux-2f7702af64d6ae7ae8b7f6d5dca1bf8bdaf0ac1f.tar.xz linux-2f7702af64d6ae7ae8b7f6d5dca1bf8bdaf0ac1f.zip | |
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 <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Signed-off-by: Ido Yariv <ido@wizery.com>
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
[tony@atomide.com: updated to be earlier in the series]
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | drivers/iommu/omap-iommu-debug.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/omap-iommu.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/omap-iopgtable.h (renamed from arch/arm/plat-omap/include/plat/iopgtable.h) | 0 | ||||
| -rw-r--r-- | drivers/iommu/omap-iovmm.c | 2 |
4 files changed, 3 insertions, 3 deletions
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 <plat/iommu.h> #include <plat/iovmm.h> -#include <plat/iopgtable.h> +#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 <plat/iommu.h> -#include <plat/iopgtable.h> +#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 index 66a813977d52..66a813977d52 100644 --- a/arch/arm/plat-omap/include/plat/iopgtable.h +++ b/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 <plat/iommu.h> #include <plat/iovmm.h> -#include <plat/iopgtable.h> +#include "omap-iopgtable.h" static struct kmem_cache *iovm_area_cachep; |