Module Name: src
Committed By: sborrill
Date: Tue Jun 2 10:14:22 UTC 2015
Modified Files:
src/sys/arch/vax/vsa [netbsd-7]: vsbus.c
Log Message:
Pull up the following revisions(s) (requested by abs in ticket #817):
sys/arch/vax/vsa/vsbus.c: revision 1.61
Fix VAX46 and VAX48 vsbus attach config. Addresses PR port-vax/49935.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.60.14.1 src/sys/arch/vax/vsa/vsbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.60 src/sys/arch/vax/vsa/vsbus.c:1.60.14.1
--- src/sys/arch/vax/vsa/vsbus.c:1.60 Thu Jun 28 13:58:21 2012
+++ src/sys/arch/vax/vsa/vsbus.c Tue Jun 2 10:14:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */
+/* $NetBSD: vsbus.c,v 1.60.14.1 2015/06/02 10:14:22 sborrill Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsbus.c,v 1.60.14.1 2015/06/02 10:14:22 sborrill Exp $");
#include "opt_cputype.h"
@@ -138,6 +138,7 @@ vsbus_attach(device_t parent, device_t s
sc->sc_intclr = (char *)sc->sc_vsregs + 15;
sc->sc_intmsk = (char *)sc->sc_vsregs + 12;
vsbus_dma_init(sc, 32768);
+ break;
#endif
default:
