| Message ID | 20200410143047.19691-1-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d1dcb7255c2b0ae77fbe297e4543c6cfff54e9b9 |
| Headers | show |
| Series | iommu: Fix MTK_IOMMU dependencies | expand |
On Fri, Apr 10, 2020 at 04:30:47PM +0200, Geert Uytterhoeven wrote: > Fixes: e93a1695d7fb5513 ("iommu: Enable compile testing for some of drivers") > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > --- > drivers/iommu/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thanks.
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 58b4a4dbfc78b9a5..bead9aaea8429447 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -457,7 +457,7 @@ config S390_AP_IOMMU config MTK_IOMMU bool "MTK IOMMU Support" - depends on ARM || ARM64 || COMPILE_TEST + depends on HAS_DMA depends on ARCH_MEDIATEK || COMPILE_TEST select ARM_DMA_USE_IOMMU select IOMMU_API
If NO_DMA=y (e.g. Sun-3 all{mod,yes}-config): drivers/iommu/dma-iommu.o: In function `iommu_dma_mmap': dma-iommu.c:(.text+0x836): undefined reference to `dma_pgprot' IOMMU_DMA must not be selected, unless HAS_DMA=y. Hence fix this by making MTK_IOMMU depend on HAS_DMA. While at it, remove the dependency on ARM || ARM64, as that is already implied by the dependency on ARCH_MEDIATEK. Fixes: e93a1695d7fb5513 ("iommu: Enable compile testing for some of drivers") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/iommu/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)