git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
setup.c
diff --git
a/arch/s390/kernel/setup.c
b/arch/s390/kernel/setup.c
index
cbb897b
..
9ed13a1
100644
(file)
--- a/
arch/s390/kernel/setup.c
+++ b/
arch/s390/kernel/setup.c
@@
-156,15
+156,11
@@
__setup("condev=", condev_setup);
static void __init set_preferred_console(void)
{
static void __init set_preferred_console(void)
{
- if (MACHINE_IS_KVM)
{
+ if (MACHINE_IS_KVM)
add_preferred_console("hvc", 0, NULL);
add_preferred_console("hvc", 0, NULL);
- s390_virtio_console_init();
- return;
- }
-
- if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)
+ else if (CONSOLE_IS_3215 || CONSOLE_IS_SCLP)
add_preferred_console("ttyS", 0, NULL);
add_preferred_console("ttyS", 0, NULL);
- if (CONSOLE_IS_3270)
+
else
if (CONSOLE_IS_3270)
add_preferred_console("tty3270", 0, NULL);
}
add_preferred_console("tty3270", 0, NULL);
}