Message ID | 1371600281-6118-9-git-send-email-sboyd@codeaurora.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Jun 18, 2013 at 05:04:38PM -0700, Stephen Boyd wrote: > Two header files exist in mach-msm's include/mach directory that > are only used by the MSM iommu driver. Move these files to the > iommu driver directory and prefix them with "msm_". This allows > us to compile the MSM iommu driver on multi-platform kernels. > > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Stepan Moskovchenko <stepanm@codeaurora.org> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > > Joerg, please ack so this can go through the MSM tree. Sure thing. Acked-by: Joerg Roedel <joro@8bytes.org>
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 8ab4f41..f5ff657 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c @@ -31,8 +31,8 @@ #include <asm/cacheflush.h> #include <asm/sizes.h> -#include <mach/iommu_hw-8xxx.h> -#include <mach/iommu.h> +#include "msm_iommu_hw-8xxx.h" +#include "msm_iommu.h" #define MRC(reg, processor, op1, crn, crm, op2) \ __asm__ __volatile__ ( \ diff --git a/arch/arm/mach-msm/include/mach/iommu.h b/drivers/iommu/msm_iommu.h similarity index 100% rename from arch/arm/mach-msm/include/mach/iommu.h rename to drivers/iommu/msm_iommu.h diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c index 9144a6b..2ac1033 100644 --- a/drivers/iommu/msm_iommu_dev.c +++ b/drivers/iommu/msm_iommu_dev.c @@ -27,8 +27,8 @@ #include <linux/err.h> #include <linux/slab.h> -#include <mach/iommu_hw-8xxx.h> -#include <mach/iommu.h> +#include "msm_iommu_hw-8xxx.h" +#include "msm_iommu.h" struct iommu_ctx_iter_data { /* input */
Two header files exist in mach-msm's include/mach directory that are only used by the MSM iommu driver. Move these files to the iommu driver directory and prefix them with "msm_". This allows us to compile the MSM iommu driver on multi-platform kernels. Cc: Joerg Roedel <joro@8bytes.org> Cc: Stepan Moskovchenko <stepanm@codeaurora.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- Joerg, please ack so this can go through the MSM tree. drivers/iommu/msm_iommu.c | 4 ++-- arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h | 0 drivers/iommu/msm_iommu_dev.c | 4 ++-- .../include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/mach-msm/include/mach/iommu.h => drivers/iommu/msm_iommu.h (100%) rename arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h => drivers/iommu/msm_iommu_hw-8xxx.h (100%) diff --git a/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h b/drivers/iommu/msm_iommu_hw-8xxx.h similarity index 100% rename from arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h rename to drivers/iommu/msm_iommu_hw-8xxx.h