aboutsummaryrefslogtreecommitdiff
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorHendrik Brueckner <brueckner@linux.vnet.ibm.com>2008-12-25 13:39:29 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-12-25 13:39:17 +0100
commit0946100f566d04cc93e86654f3ba588ee94b3f4c (patch)
tree0474b6208031f57abd9a55ae67640425e5bbf5b7 /arch/s390/kernel
parent21e7b2c4d59e5d6631b25e71e777cb0160997d6a (diff)
[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>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/setup.c3
1 files changed, 3 insertions, 0 deletions
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
*/