iommu/msm: Move mach includes to iommu directory

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. Acked-by: Joerg Roedel <[email protected]> Cc: Stepan Moskovchenko <[email protected]> Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: David Brown <[email protected]>
kusora · Aug 6, 2013 · 0b559df · 0b559df
1 parent 20508a1
commit 0b559df
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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 → drivers/iommu/msm_iommu.h b/arch/arm/mach-msm/include/mach/iommu.h → drivers/iommu/msm_iommu.h
diff --git 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 */

diff --git a/...arm/mach-msm/include/mach/iommu_hw-8xxx.h → drivers/iommu/msm_iommu_hw-8xxx.h b/...arm/mach-msm/include/mach/iommu_hw-8xxx.h → drivers/iommu/msm_iommu_hw-8xxx.h