diff --git a/[refs] b/[refs]
index 9171d372131a..71e36b8cc675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25ca1251dc55673da1f3c6ddc1bf93fbb7fc83fc
+refs/heads/master: 07606309ff5a9136e340b9ca87c831650c1ec47a
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index f46a1b50ddee..2ae5d72f47ed 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -121,6 +121,9 @@ config 32BIT
 	bool
 	default y if !64BIT
 
+config KTIME_SCALAR
+	def_bool 32BIT
+
 config SMP
 	bool "Symmetric multi-processing support"
 	---help---