summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/setup.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-11 23:24:30 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:12:28 -0800
commit1a7a242c898dd131f2df005c492e9b44fb8900e0 (patch)
tree5f00961b9c6539951adda7bfaafda030cea39c38 /arch/sparc64/kernel/setup.c
parent02fead75055246d01af56a45a9d1b311d506da3e (diff)
downloadblackbird-op-linux-1a7a242c898dd131f2df005c492e9b44fb8900e0.tar.gz
blackbird-op-linux-1a7a242c898dd131f2df005c492e9b44fb8900e0.zip
[SPARC64]: Recognize "virtual-console" as input and output console device.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/setup.c')
-rw-r--r--arch/sparc64/kernel/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index ca75f3b26a37..4f253a0755b0 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -405,6 +405,11 @@ static int __init set_preferred_console(void)
serial_console = 2;
} else if (idev == PROMDEV_IRSC && odev == PROMDEV_ORSC) {
serial_console = 3;
+ } else if (idev == PROMDEV_IVCONS && odev == PROMDEV_OVCONS) {
+ /* sunhv_console_init() doesn't check the serial_console
+ * value anyways...
+ */
+ serial_console = 4;
} else {
prom_printf("Inconsistent console: "
"input %d, output %d\n",
OpenPOWER on IntegriCloud