From 67d88b0a9910a68bb666b448d2dac29cb4d3d8c2 Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sun, 21 Apr 1996 22:33:19 +0000
Subject: partial sync with netbsd 960418, more to come

---
 sys/dev/pci/ncrstat.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'sys/dev/pci/ncrstat.c')

diff --git a/sys/dev/pci/ncrstat.c b/sys/dev/pci/ncrstat.c
index 37374c88b38..6925cd42352 100644
--- a/sys/dev/pci/ncrstat.c
+++ b/sys/dev/pci/ncrstat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncrstat.c,v 1.6 1995/01/27 05:44:31 cgd Exp $	*/
+/*	$NetBSD: ncrstat.c,v 1.7 1996/03/17 00:55:36 thorpej Exp $	*/
 
 /**************************************************************************
 **
@@ -92,7 +92,7 @@ struct nlist nl[] = {
 	{ "_ncr_version" },
 #ifdef __NetBSD__
 #define	N_NCRCD	1
-	{ "_ncrcd" },
+	{ "_ncr_cd" },
 #else
 #define	N_NCRP	1
 	{ "_ncrp" },
@@ -114,7 +114,7 @@ u_long	ccb_base;
 
 u_long  ncr_unit;
 #ifdef __NetBSD__
-struct	cfdriver ncrcd;
+struct	cfdriver ncr_cd;
 #else
 u_long	ncr_units;
 #endif
@@ -224,20 +224,20 @@ void open_kvm(int flags)
 
 	if (!KVM_READ (
 		nl[N_NCRCD].n_value,
-		&ncrcd,
-		sizeof (ncrcd))) {
+		&ncr_cd,
+		sizeof (ncr_cd))) {
 		fprintf (stderr, "%s: bad kvm read.\n", prog);
 		exit (1);
 	};
 
-	if (ncr_unit >= ncrcd.cd_ndevs){
+	if (ncr_unit >= ncr_cd.cd_ndevs){
 		fprintf (stderr, "%s: bad unit number (valid range: 0-%d).\n",
-			prog, ncrcd.cd_ndevs-1);
+			prog, ncr_cd.cd_ndevs-1);
 		exit (1);
 	};
 
 	if (!KVM_READ (
-		ncrcd.cd_devs+4*ncr_unit,
+		ncr_cd.cd_devs+4*ncr_unit,
 		&ncr_base,
 		sizeof (ncr_base))) {
 		fprintf (stderr, "%s: bad kvm read.\n", prog);
-- 
cgit v1.2.3