diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-02-28 19:26:24 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-02-28 19:26:19 -0800 |
| commit | ecd13b84cf67d4225dc3c0f7c4dc11b0092eb40e (patch) | |
| tree | 763f67b35c0e244e4f096c026b94afa071d51603 /drivers/iommu | |
| parent | 6fdb535b772d6100c74618a4d9b51fff140b7d96 (diff) | |
| parent | 76c5d9e1d97cfb692ae60165472bb1443f171894 (diff) | |
Merge "iommu: clean up includes"
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/msm_iommu-v1.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/msm_iommu_dev-v1.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/msm_iommu_sec.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iommu/msm_iommu-v1.c b/drivers/iommu/msm_iommu-v1.c index b586a0a1837f..092abd58ef60 100644 --- a/drivers/iommu/msm_iommu-v1.c +++ b/drivers/iommu/msm_iommu-v1.c @@ -23,6 +23,7 @@ #include <linux/mutex.h> #include <linux/slab.h> #include <linux/iommu.h> +#include <linux/msm-bus.h> #include <linux/clk.h> #include <linux/scatterlist.h> #include <linux/of.h> @@ -34,7 +35,6 @@ #include <mach/iommu.h> #include <mach/msm_iommu_priv.h> #include <mach/iommu_perfmon.h> -#include <mach/msm_bus.h> #include "msm_iommu_pagetable.h" #ifdef CONFIG_IOMMU_LPAE diff --git a/drivers/iommu/msm_iommu_dev-v1.c b/drivers/iommu/msm_iommu_dev-v1.c index 195955446542..88bb04b8749d 100644 --- a/drivers/iommu/msm_iommu_dev-v1.c +++ b/drivers/iommu/msm_iommu_dev-v1.c @@ -19,6 +19,7 @@ #include <linux/clk.h> #include <linux/iommu.h> #include <linux/interrupt.h> +#include <linux/msm-bus.h> #include <linux/err.h> #include <linux/slab.h> #include <linux/of.h> @@ -28,7 +29,6 @@ #include <mach/iommu_hw-v1.h> #include <mach/iommu.h> #include <mach/iommu_perfmon.h> -#include <mach/msm_bus.h> static struct of_device_id msm_iommu_ctx_match_table[]; diff --git a/drivers/iommu/msm_iommu_sec.c b/drivers/iommu/msm_iommu_sec.c index 431d14ce3be7..38706a5ee7f6 100644 --- a/drivers/iommu/msm_iommu_sec.c +++ b/drivers/iommu/msm_iommu_sec.c @@ -35,7 +35,6 @@ #include <mach/iommu_hw-v1.h> #include <mach/msm_iommu_priv.h> #include <mach/iommu.h> -#include <mach/memory.h> /* bitmap of the page sizes currently supported */ #define MSM_IOMMU_PGSIZES (SZ_4K | SZ_64K | SZ_1M | SZ_16M) |