diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-26 22:19:57 -0500 |
| commit | 97309d1a0bbdcb0813ea08574b4473d8e5416012 (patch) | |
| tree | 0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b /arch/sparc64/prom/console.c | |
| parent | b4ea75b649417606fd6b38710a2962ec9770e772 (diff) | |
| parent | efd51b5c6798d103e3aa683464aebb2019b62119 (diff) | |
| download | kernel_samsung_tuna-97309d1a0bbdcb0813ea08574b4473d8e5416012.zip kernel_samsung_tuna-97309d1a0bbdcb0813ea08574b4473d8e5416012.tar.gz kernel_samsung_tuna-97309d1a0bbdcb0813ea08574b4473d8e5416012.tar.bz2 | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/sparc64/prom/console.c')
| -rw-r--r-- | arch/sparc64/prom/console.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sparc64/prom/console.c b/arch/sparc64/prom/console.c index eae5db8..ac6d035 100644 --- a/arch/sparc64/prom/console.c +++ b/arch/sparc64/prom/console.c @@ -99,8 +99,12 @@ prom_query_input_device(void) if (!strncmp(propb, "keyboard", 8)) return PROMDEV_ITTYA; + if (!strncmp (propb, "rsc", 3)) + return PROMDEV_IRSC; + if (strncmp (propb, "tty", 3) || !propb[3]) return PROMDEV_I_UNK; + switch (propb[3]) { case 'a': return PROMDEV_ITTYA; case 'b': return PROMDEV_ITTYB; @@ -136,8 +140,12 @@ prom_query_output_device(void) if (!strncmp(propb, "screen", 6)) return PROMDEV_OTTYA; + if (!strncmp (propb, "rsc", 3)) + return PROMDEV_ORSC; + if (strncmp (propb, "tty", 3) || !propb[3]) return PROMDEV_O_UNK; + switch (propb[3]) { case 'a': return PROMDEV_OTTYA; case 'b': return PROMDEV_OTTYB; |