1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index d260605e6d5f..dd5112265cc9 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -76,7 +76,7 @@ config AMD_IOMMU_STATS
 
 config AMD_IOMMU_V2
         tristate "AMD IOMMU Version 2 driver"
-        depends on AMD_IOMMU && PROFILING
+        depends on AMD_IOMMU
         select MMU_NOTIFIER
         ---help---
           This option enables support for the AMD IOMMUv2 features of the IOMMU
@@ -143,16 +143,12 @@ config OMAP_IOMMU
         depends on ARCH_OMAP2PLUS
         select IOMMU_API
 
-config OMAP_IOVMM
-        tristate "OMAP IO Virtual Memory Manager Support"
-        depends on OMAP_IOMMU
-
 config OMAP_IOMMU_DEBUG
-       tristate "Export OMAP IOMMU/IOVMM internals in DebugFS"
-       depends on OMAP_IOVMM && DEBUG_FS
+       tristate "Export OMAP IOMMU internals in DebugFS"
+       depends on OMAP_IOMMU && DEBUG_FS
        help
          Select this to see extensive information about
-         the internal state of OMAP IOMMU/IOVMM in debugfs.
+         the internal state of OMAP IOMMU in debugfs.
 
          Say N unless you know you need this.
 
@@ -180,6 +176,7 @@ config EXYNOS_IOMMU
         bool "Exynos IOMMU Support"
         depends on ARCH_EXYNOS
         select IOMMU_API
+        select ARM_DMA_USE_IOMMU
         help
           Support for the IOMMU (System MMU) of Samsung Exynos application
           processor family. This enables H/W multimedia accelerators to see