diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-02-04 22:17:53 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-02-10 17:02:27 +0000 |
| commit | d123cf82d339c5cc4ffe2a481e0caa23a501d4ac (patch) | |
| tree | 9cdb6030cd074c9176eadf8fe573d01386e93540 /drivers/iommu/arm-smmu.c | |
| parent | 57ca90f6800987ac274d7ba065ae6692cdf9bcd7 (diff) | |
| download | talos-op-linux-d123cf82d339c5cc4ffe2a481e0caa23a501d4ac.tar.gz talos-op-linux-d123cf82d339c5cc4ffe2a481e0caa23a501d4ac.zip | |
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/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
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) 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; } |
