diff --git a/[refs] b/[refs]
index a211085b75f0..3d3e57732148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c3b96e44739cdba7a75030107a2b47a15ee5f60
+refs/heads/master: 2a2ae2426bba944ce6dbcad35e1580df57aafcf1
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 4d4f4188cdf1..9676100b83ee 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -59,9 +59,6 @@ config NEED_DMA_MAP_STATE
 config SWIOTLB
        bool
 
-config IOMMU_HELPER
-       bool
-
 config GENERIC_LOCKBREAK
 	def_bool n