[PATCH 4/4] ARM: OMAP2+: Move iopgtable header to drivers/iommu/
Tony Lindgren
tony at atomide.com
Mon Oct 15 20:36:43 EDT 2012
From: Ido Yariv <ido at wizery.com>
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: Joerg Roedel <joerg.roedel at amd.com>
Cc: Ohad Ben-Cohen <ohad at wizery.com>
Signed-off-by: Ido Yariv <ido at wizery.com>
Signed-off-by: Tony Lindgren <tony at atomide.com>
---
drivers/iommu/omap-iommu-debug.c | 3 +--
drivers/iommu/omap-iommu.c | 3 +--
drivers/iommu/omap-iopgtable.h | 0
drivers/iommu/omap-iovmm.c | 3 +--
4 files changed, 3 insertions(+), 6 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 8c1e30b..84dbfd2 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -22,8 +22,7 @@
#include <linux/platform_data/iommu-omap.h>
#include <linux/platform_data/iovmm-omap.h>
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
#include "omap-iommu.h"
#define MAXCOLUMN 100 /* for short messages */
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index 6100334..1ca33b0 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -26,8 +26,7 @@
#include <linux/platform_data/iommu-omap.h>
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
#include "omap-iommu.h"
#define for_each_iotlb_cr(obj, n, __i, cr) \
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 b5ac2cd..2820e3a 100644
--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c
@@ -24,8 +24,7 @@
#include <linux/platform_data/iommu-omap.h>
#include <linux/platform_data/iovmm-omap.h>
-#include <plat/iopgtable.h>
-
+#include "omap-iopgtable.h"
#include "omap-iommu.h"
static struct kmem_cache *iovm_area_cachep;
More information about the linux-arm-kernel
mailing list