diff --git a/[refs] b/[refs]
index 7d95000fb65f..58d50349a9c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e93be88d7ec9d183c1cca51eabe040c051cdb687
+refs/heads/master: 18b743dc948aaddc46258b73f17bdec2ee4019ee
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index bb0c0d0f6db7..c70d8867800f 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -575,7 +575,7 @@ config SWIOTLB
 	  3 GB of memory. If unsure, say Y.
 
 config IOMMU_HELPER
-	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
+	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
 config MAXSMP
 	bool "Configure Maximum number of SMP Processors and NUMA Nodes"
 	depends on X86_64 && SMP