[src/netbsd-6]: src/sys/arch/vax/vax Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/e6fafc46abac
branches:  netbsd-6
changeset: 776970:e6fafc46abac
user:      snj <snj%NetBSD.org@localhost>
date:      Tue May 19 05:43:50 2015 +0000

description:
Pull up following revision(s) (requested by ragge in ticket #1298):
        sys/arch/vax/vax/ka660.c: revision 1.11
PR port-vax/49884
Fixes bug introduced in earlier cleanup.

diffstat:

 sys/arch/vax/vax/ka660.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r d3d7f2f157fb -r e6fafc46abac sys/arch/vax/vax/ka660.c
--- a/sys/arch/vax/vax/ka660.c  Sat May 02 16:22:10 2015 +0000
+++ b/sys/arch/vax/vax/ka660.c  Tue May 19 05:43:50 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $  */
+/*     $NetBSD: ka660.c,v 1.10.14.1 2015/05/19 05:43:50 snj Exp $      */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.10 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka660.c,v 1.10.14.1 2015/05/19 05:43:50 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,7 +61,7 @@
 static void ka660_attach_cpu(device_t);
 static int ka660_mchk(void *);
 
-static const char * const ka660_devs[] = { "cpu", "sgec", "vsbus", NULL };
+static const char * const ka660_devs[] = { "cpu", "sgec", "shac", "uba", NULL };
 
 /* 
  * Declaration of 660-specific calls.
@@ -92,7 +92,7 @@
 ka660_attach_cpu(device_t self)
 {
        aprint_normal(
-           ": %s, Rigel (ucode rev. %d), 2KB L1 cache, 128KB L2 cache\n",
+           ": %s, SOC (ucode rev. %d), 6KB L1 cache\n",
            "KA660",
            vax_cpudata & 0377);
 }