diff --git a/[refs] b/[refs]
index 6b453f3c666e..81611ef10954 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fa1098ac1bc2ad19627a08ae654caf360bc85aa
+refs/heads/master: d9c11b1e8aade25d7d75fb8f344e68e1301822e4
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index ff19efdf6fef..636bcb81d068 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -406,7 +406,7 @@ config QDIO
 	  If unsure, say Y.
 
 config CHSC_SCH
-	def_tristate y
+	def_tristate m
 	prompt "Support for CHSC subchannels"
 	help
 	  This driver allows usage of CHSC subchannels. A CHSC subchannel