From: Tony Lindgren <tony@atomide.com>
To: linux-kernel@vger.kernel.org
Cc: Ohad Ben-Cohen <ohad@wizery.com>, Joerg Roedel <joro@8bytes.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Omar Ramirez Luna <omar.luna@linaro.org>,
linux-omap@vger.kernel.org, Ido Yariv <ido@wizery.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] ARM: OMAP2+: Move iopgtable header to drivers/iommu/
Date: Fri, 02 Nov 2012 12:24:00 -0700 [thread overview]
Message-ID: <20121102192400.4253.83596.stgit@muffinssi.local> (raw)
In-Reply-To: <20121102192221.4253.34303.stgit@muffinssi.local>
From: Ido Yariv <ido@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 <joro@8bytes.org>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
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>
[tony@atomide.com: updated to be earlier in the series]
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/iommu/omap-iommu-debug.c | 2 +-
drivers/iommu/omap-iommu.c | 2 +-
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 f55fc5d..0cac372 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 d0b1234..f2bbfb0 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
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 2e10c3e..b332392 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;
next prev parent reply other threads:[~2012-11-02 19:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-02 19:23 [PATCH v5 0/6] Move rest of omap-iommu to live in drivers/iommu Tony Lindgren
2012-11-02 19:23 ` [PATCH 1/6] ARM: OMAP: Merge iommu2.h into iommu.h Tony Lindgren
2012-11-02 19:24 ` Tony Lindgren [this message]
2012-11-02 19:24 ` [PATCH 3/6] ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h Tony Lindgren
2012-11-02 19:24 ` [PATCH 4/6] ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c Tony Lindgren
2012-11-02 19:24 ` [PATCH 5/6] ARM: OMAP2+: Make some definitions local Tony Lindgren
2012-11-02 19:24 ` [PATCH 6/6] ARM: OMAP2+: Move iommu/iovmm headers to platform_data Tony Lindgren
2012-11-11 9:39 ` [PATCH v5 0/6] Move rest of omap-iommu to live in drivers/iommu Ohad Ben-Cohen
2012-11-12 18:40 ` Omar Ramirez Luna
2012-11-12 22:00 ` Tony Lindgren
2012-11-17 12:10 ` Joerg Roedel
2012-11-20 20:00 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121102192400.4253.83596.stgit@muffinssi.local \
--to=tony@atomide.com \
--cc=ido@wizery.com \
--cc=joro@8bytes.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=ohad@wizery.com \
--cc=omar.luna@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®