aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2014-02-04 17:17:53 -0500
committerWill Deacon <will.deacon@arm.com>2014-02-10 12:02:27 -0500
commitd123cf82d339c5cc4ffe2a481e0caa23a501d4ac (patch)
tree9cdb6030cd074c9176eadf8fe573d01386e93540 /drivers/iommu
parent57ca90f6800987ac274d7ba065ae6692cdf9bcd7 (diff)
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>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/arm-smmu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 0ae4dd39197f..6fe7922ecc1d 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2004,8 +2004,10 @@ static int __init arm_smmu_init(void)
2004 if (!iommu_present(&platform_bus_type)) 2004 if (!iommu_present(&platform_bus_type))
2005 bus_set_iommu(&platform_bus_type, &arm_smmu_ops); 2005 bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
2006 2006
2007#ifdef CONFIG_ARM_AMBA
2007 if (!iommu_present(&amba_bustype)) 2008 if (!iommu_present(&amba_bustype))
2008 bus_set_iommu(&amba_bustype, &arm_smmu_ops); 2009 bus_set_iommu(&amba_bustype, &arm_smmu_ops);
2010#endif
2009 2011
2010 return 0; 2012 return 0;
2011} 2013}