From: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Date: Thu, 25 Dec 2008 12:39:29 +0000 (+0100)
Subject: [S390] s390/setup: set default preferred console device "ttyS"
X-Git-Tag: v2.6.29-rc1~584^2~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0946100f566d04cc93e86654f3ba588ee94b3f4c;p=linux-2.6-omap-h63xx.git

[S390] s390/setup: set default preferred console device "ttyS"

This patch sets the default console device for s390.

The console= kernel parameter can be still used to switch the preferred
console to some other device. In that case, console messages are also
printed on the default console device (ttyS0).

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 323dedecdf5..bed9dcb34fd 100644
--- a/arch/s390/kernel/setup.c
+++ b/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
          */