Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecd13b84 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: clean up includes"

parents 6fdb535b 76c5d9e1

drivers/iommu/msm_iommu-v1.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/iommu/msm_iommu_dev-v1.c

+1 −1
Original line number Diff line number Diff line
@@ -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[];

drivers/iommu/msm_iommu_sec.c

+0 −1
Original line number Diff line number Diff line
@@ -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)