[src/netbsd-2-0]: src/sys/arch/sgimips/sgimips Pull up revision 1.26 (request...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f427281e84ba
branches:  netbsd-2-0
changeset: 562145:f427281e84ba
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jul 23 07:00:05 2004 +0000

description:
Pull up revision 1.26 (requested by rumble in ticket #682):
don't attempt to init pckbd console on IP20

diffstat:

 sys/arch/sgimips/sgimips/console.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r b641b9cd3fc4 -r f427281e84ba sys/arch/sgimips/sgimips/console.c
--- a/sys/arch/sgimips/sgimips/console.c        Fri Jul 23 06:59:38 2004 +0000
+++ b/sys/arch/sgimips/sgimips/console.c        Fri Jul 23 07:00:05 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: console.c,v 1.22.2.3 2004/07/23 06:59:10 tron Exp $    */
+/*     $NetBSD: console.c,v 1.22.2.4 2004/07/23 07:00:05 tron Exp $    */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.22.2.3 2004/07/23 06:59:10 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: console.c,v 1.22.2.4 2004/07/23 07:00:05 tron Exp $");
 
 #include "opt_kgdb.h"
 
@@ -86,7 +86,6 @@
        speed = strtoul(dbaud, NULL, 10);
 
        switch (mach_type) {
-       case MACH_SGI_IP20:
        case MACH_SGI_IP22:
 #if (NGIO > 0) && (NPCKBC > 0) 
                if (strcmp(consdev, "video()") == 0) {
@@ -105,6 +104,7 @@
                }
 #endif
        case MACH_SGI_IP12:
+       case MACH_SGI_IP20:
 #if (NZSC > 0)
                if ((strlen(consdev) == 9) &&
                    (!strncmp(consdev, "serial", 6)) &&