diff --git a/[refs] b/[refs]
index 3df5b2e82796..c2fb71425309 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56b86b615b807e043339979878a2de88f900ee4f
+refs/heads/master: eca577ef5989d25dedc6b0fae3c4622ceaee8005
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 21a7030abbb4..068e55d1bba8 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -60,6 +60,9 @@ config NO_IOMEM
 config NO_DMA
 	def_bool y
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool 64BIT
+
 config GENERIC_LOCKBREAK
 	bool
 	default y