From: Will Deacon <will.deacon@arm.com>
Date: Tue, 4 Feb 2014 22:17:53 +0000 (+0000)
Subject: iommu/arm-smmu: fix compilation issue when !CONFIG_ARM_AMBA
X-Git-Tag: v3.14-rc4~18^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d123cf82d339c5cc4ffe2a481e0caa23a501d4ac;p=thirdparty%2Fkernel%2Flinux.git

iommu/arm-smmu: fix compilation issue when !CONFIG_ARM_AMBA

If !CONFIG_ARM_AMBA, we shouldn't try to register ourselves with the
amba_bustype.

Signed-off-by: Will Deacon <will.deacon@arm.com>
---

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 0ae4dd39197f9..6fe7922ecc1d7 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2004,8 +2004,10 @@ static int __init arm_smmu_init(void)
 	if (!iommu_present(&platform_bus_type))
 		bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
 
+#ifdef CONFIG_ARM_AMBA
 	if (!iommu_present(&amba_bustype))
 		bus_set_iommu(&amba_bustype, &arm_smmu_ops);
+#endif
 
 	return 0;
 }