From e317564e4ceefcdb23a08a46af182031ef950eb4 Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 6 Jan 2020 16:31:04 -0800 Subject: [PATCH] iommu/arm-smmu: Rename the ARM SMMU module In the GKI configuration, the arm-smmu-mod module will already be present as a GKI module (i.e. the module will be generated from the GKI ARM SMMU source). As such, there is no way to distinguish between Qualcomm's ARM SMMU module, and the GKI ARM SMMU module, since they have the same name. Thus, rename Qualcomm's ARM SMMU module to distinguish between the two. Change-Id: I6a41d3d518a800da4d560c8b8d2b8c48f1866d9a Signed-off-by: Isaac J. Manjarres --- drivers/iommu/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index b356598dc95c..8e85bce4fb84 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -16,8 +16,8 @@ obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o -obj-$(CONFIG_ARM_SMMU) += arm-smmu-mod.o -arm-smmu-mod-objs += arm-smmu.o arm-smmu-impl.o +obj-$(CONFIG_ARM_SMMU) += qcom-arm-smmu-mod.o +qcom-arm-smmu-mod-objs += arm-smmu.o arm-smmu-impl.o obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o obj-$(CONFIG_DMAR_TABLE) += dmar.o obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o