projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
57ca90f
)
iommu/arm-smmu: fix compilation issue when !CONFIG_ARM_AMBA
author
Will Deacon
<will.deacon@arm.com>
Tue, 4 Feb 2014 22:17:53 +0000
(22:17 +0000)
committer
Will 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
patch
|
blob
|
history
diff --git
a/drivers/iommu/arm-smmu.c
b/drivers/iommu/arm-smmu.c
index
0ae4dd3
..
6fe7922
100644
(file)
--- 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;
}