2 files changed, 6 insertions, 4 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3aa6c821449a..07f5d353b54a 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -47,6 +47,9 @@ config MMU
 config SWIOTLB
        bool
 
+config IOMMU_HELPER
+       bool
+
 config GENERIC_LOCKBREAK
         bool
         default y
@@ -615,7 +618,7 @@ config IRQ_PER_CPU
         default y
 
 config IOMMU_HELPER
-        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC)
+        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
 
 source "arch/ia64/hp/sim/Kconfig"
 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a12dbb2b93f3..1d9d874cba59 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -537,9 +537,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
           Calgary anyway, pass 'iommu=calgary' on the kernel command line.
           If unsure, say Y.
 
-config IOMMU_HELPER
-        def_bool (CALGARY_IOMMU || GART_IOMMU)
-
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
         bool
@@ -550,6 +547,8 @@ config SWIOTLB
           access 32-bits of memory can be used on systems with more than
           3 GB of memory. If unsure, say Y.
 
+config IOMMU_HELPER
+        def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
 
 config NR_CPUS
         int "Maximum number of CPUs (2-255)"