diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-24 13:54:33 -0700 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2013-08-06 11:18:03 -0700 |
| commit | 0b559df5ce587cd2430bdc660c3e60d554d2c907 (patch) | |
| tree | 6b0f2d2727f7b3d7287215dfb61a0449640fa23e | |
| parent | 20508a15ba9d24e1fd04ebfbdf38d862fe708061 (diff) | |
| download | talos-op-linux-0b559df5ce587cd2430bdc660c3e60d554d2c907.tar.gz talos-op-linux-0b559df5ce587cd2430bdc660c3e60d554d2c907.zip | |
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 <joro@8bytes.org>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
| -rw-r--r-- | drivers/iommu/msm_iommu.c | 4 | ||||
| -rw-r--r-- | drivers/iommu/msm_iommu.h (renamed from arch/arm/mach-msm/include/mach/iommu.h) | 0 | ||||
| -rw-r--r-- | drivers/iommu/msm_iommu_dev.c | 4 | ||||
| -rw-r--r-- | drivers/iommu/msm_iommu_hw-8xxx.h (renamed from arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 8ab4f41090af..f5ff657f49fa 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 index 5c7c955e6d25..5c7c955e6d25 100644 --- a/arch/arm/mach-msm/include/mach/iommu.h +++ b/drivers/iommu/msm_iommu.h diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c index 6ba351477132..0a1c9626aa9e 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 */ diff --git a/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h b/drivers/iommu/msm_iommu_hw-8xxx.h index fc160101dead..fc160101dead 100644 --- a/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h +++ b/drivers/iommu/msm_iommu_hw-8xxx.h |
