]> Pileus Git - ~andy/linux/commitdiff
iommu/arm-smmu: fix compilation issue when !CONFIG_ARM_AMBA
authorWill Deacon <will.deacon@arm.com>
Tue, 4 Feb 2014 22:17:53 +0000 (22:17 +0000)
committerWill Deacon <will.deacon@arm.com>
Mon, 10 Feb 2014 17:02:27 +0000 (17:02 +0000)
If !CONFIG_ARM_AMBA, we shouldn't try to register ourselves with the
amba_bustype.

Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/iommu/arm-smmu.c

index 0ae4dd39197f90e46cc298d9b89756dadfcf8d94..6fe7922ecc1d72a16dda290fc8c4e3620aedab2c 100644 (file)
@@ -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;
 }