Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / iommu / Kconfig

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 624510ae877c23f889441f2bfe296cfa47c8cd9b..dd1dc39f84ff2783f2481a7fc81bdede7e6e1b65 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -70,9 +70,9 @@ config OF_IOMMU
 # IOMMU-agnostic DMA-mapping layer
 config IOMMU_DMA
        bool
-       depends on NEED_SG_DMA_LENGTH
        select IOMMU_API
        select IOMMU_IOVA
+       select NEED_SG_DMA_LENGTH
 
 config FSL_PAMU
        bool "Freescale IOMMU support"
@@ -262,7 +262,7 @@ config TEGRA_IOMMU_SMMU
 
 config EXYNOS_IOMMU
        bool "Exynos IOMMU Support"
-       depends on ARCH_EXYNOS && ARM && MMU
+       depends on ARCH_EXYNOS && MMU
        select IOMMU_API
        select ARM_DMA_USE_IOMMU
        help
@@ -285,7 +285,7 @@ config EXYNOS_IOMMU_DEBUG
 config IPMMU_VMSA
        bool "Renesas VMSA-compatible IPMMU"
        depends on ARM_LPAE
-       depends on ARCH_SHMOBILE || COMPILE_TEST
+       depends on ARCH_RENESAS || COMPILE_TEST
        select IOMMU_API
        select IOMMU_IO_PGTABLE_LPAE
        select ARM_DMA_USE_IOMMU