diff --git a/[refs] b/[refs]
index ffb136ca8a0c..a04540f8c086 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21e7b2c4d59e5d6631b25e71e777cb0160997d6a
+refs/heads/master: 0946100f566d04cc93e86654f3ba588ee94b3f4c
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index 323dedecdf54..bed9dcb34fda 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -740,6 +740,9 @@ static void __init setup_hwcaps(void)
 void __init
 setup_arch(char **cmdline_p)
 {
+	/* set up preferred console */
+	add_preferred_console("ttyS", 0, NULL);
+
         /*
          * print what head.S has found out about the machine
          */