Module Name: src
Committed By: snj
Date: Thu Mar 26 17:09:33 UTC 2009
Modified Files:
src/sys/dev/mvme [netbsd-5]: osiop_pcctwo.c
Log Message:
Pull up following revision(s) (requested by scw in ticket #605):
sys/dev/mvme/osiop_pcctwo.c: revision 1.14
Fix fallout from device_t changes - initialise sc->sc_osiop.sc_dev
before calling osiop_attach().
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.10.1 src/sys/dev/mvme/osiop_pcctwo.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/dev/mvme/osiop_pcctwo.c
diff -u src/sys/dev/mvme/osiop_pcctwo.c:1.13 src/sys/dev/mvme/osiop_pcctwo.c:1.13.10.1
--- src/sys/dev/mvme/osiop_pcctwo.c:1.13 Mon Apr 28 20:23:54 2008
+++ src/sys/dev/mvme/osiop_pcctwo.c Thu Mar 26 17:09:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop_pcctwo.c,v 1.13 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: osiop_pcctwo.c,v 1.13.10.1 2009/03/26 17:09:33 snj Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.13 2008/04/28 20:23:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.13.10.1 2009/03/26 17:09:33 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,6 +128,7 @@
#error Set up siop clock speed for mvme187
#endif
+ sc->sc_osiop.sc_dev = self;
sc->sc_osiop.sc_bst = pa->pa_bust;
sc->sc_osiop.sc_dmat = pa->pa_dmat;
(void) bus_space_map(sc->sc_osiop.sc_bst, pa->pa_offset, OSIOP_NREGS,
