From 941871d6ab325219ea291403a14d5b788a55787b Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@NetBSD.org>
Date: Wed, 23 Nov 1994 07:02:02 +0000
Subject: [PATCH] XXmatch change (and a few __P() as well)

---
 sys/arch/sparc/dev/bsd_audio.c    | 12 ++++++------
 sys/arch/sparc/dev/cgsix.c        | 14 +++++++-------
 sys/arch/sparc/dev/cgthree.c      | 12 ++++++------
 sys/arch/sparc/dev/dma.c          | 10 +++++-----
 sys/arch/sparc/dev/esp.c          | 10 +++++-----
 sys/arch/sparc/dev/if_le.c        | 10 +++++-----
 sys/arch/sparc/dev/obio.c         | 18 +++++++++---------
 sys/arch/sparc/dev/sbus.c         | 10 +++++-----
 sys/arch/sparc/dev/zs.c           | 10 +++++-----
 sys/arch/sparc/include/autoconf.h |  4 ++--
 sys/arch/sparc/sparc/autoconf.c   |  8 ++++----
 sys/arch/sparc/sparc/auxreg.c     | 10 +++++-----
 sys/arch/sparc/sparc/clock.c      | 18 +++++++++---------
 sys/arch/sparc/sparc/cpu.c        | 10 +++++-----
 sys/arch/sparc/sparc/memreg.c     | 10 +++++-----
 15 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/sys/arch/sparc/dev/bsd_audio.c b/sys/arch/sparc/dev/bsd_audio.c
index 9157c6e4ccb6..6e8a41c96d87 100644
--- a/sys/arch/sparc/dev/bsd_audio.c
+++ b/sys/arch/sparc/dev/bsd_audio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsd_audio.c,v 1.6 1994/11/20 20:51:52 deraadt Exp $ */
+/*	$NetBSD: bsd_audio.c,v 1.7 1994/11/23 07:02:02 deraadt Exp $ */
 
 /*
  * Copyright (c) 1991, 1992, 1993
@@ -266,8 +266,8 @@ audioattach(dev)
 #define AUDIO_SET_SWINTR ienab_bis(IE_L6)
 
 /* autoconfiguration driver */
-void	audioattach(struct device *, struct device *, void *);
-int	audiomatch(struct device *, struct cfdata *, void *);
+void	audioattach __P((struct device *, struct device *, void *));
+int	audiomatch __P((struct device *, void *, void *));
 struct	cfdriver audiocd =
     { NULL, "audio", audiomatch, audioattach,
       DV_DULL, sizeof(struct audio_softc) };
@@ -275,11 +275,11 @@ struct	cfdriver audiocd =
 #define UIOMOVE(cp, len, code, uio) uiomove(cp, len, uio)
 
 int
-audiomatch(parent, cf, aux)
+audiomatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 	register struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c
index 4b1212c2cd4e..4ef1644b7c23 100644
--- a/sys/arch/sparc/dev/cgsix.c
+++ b/sys/arch/sparc/dev/cgsix.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgsix.c,v 1.10 1994/11/20 20:51:59 deraadt Exp $ */
+/*	$NetBSD: cgsix.c,v 1.11 1994/11/23 07:02:05 deraadt Exp $ */
 
 /*
  * Copyright (c) 1993
@@ -108,14 +108,14 @@ struct cgsix_softc {
 };
 
 /* autoconfiguration driver */
-static void	cgsixattach(struct device *, struct device *, void *);
-static int	cgsixmatch(struct device *, struct cfdata *, void *);
+static void	cgsixattach __P((struct device *, struct device *, void *));
+static int	cgsixmatch __P((struct device *, void *, void *));
 struct cfdriver cgsixcd =
     { NULL, "cgsix", cgsixmatch, cgsixattach,
       DV_DULL, sizeof(struct cgsix_softc) };
 
 /* frame buffer generic driver */
-static void	cg6_unblank(struct device *);
+static void	cg6_unblank __P((struct device *));
 static struct fbdriver cg6_fbdriver = { cg6_unblank };
 
 /*
@@ -137,11 +137,11 @@ static void cg6_loadcursor __P((struct cgsix_softc *));/* set shape */
  * Match a cgsix.
  */
 int
-cgsixmatch(parent, cf, aux)
+cgsixmatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 	struct cg6_layout *p = (struct cg6_layout *)ra->ra_vaddr;
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index bb521382e3fe..7c583eefbfff 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgthree.c,v 1.11 1994/11/20 20:52:02 deraadt Exp $ */
+/*	$NetBSD: cgthree.c,v 1.12 1994/11/23 07:02:07 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -85,7 +85,7 @@ struct cgthree_softc {
 
 /* autoconfiguration driver */
 static void	cgthreeattach(struct device *, struct device *, void *);
-static int	cgthreematch(struct device *, struct cfdata *, void *);
+static int	cgthreematch(struct device *, void *, void *);
 struct cfdriver cgthreecd = {
 	NULL, "cgthree", cgthreematch, cgthreeattach,
 	DV_DULL, sizeof(struct cgthree_softc)
@@ -106,14 +106,14 @@ static void cgthreeloadcmap __P((struct cgthree_softc *, int, int));
 #define	CGTHREE_MAJOR	55		/* XXX */
 
 /*
- * Match a cgsix.
+ * Match a cgthree.
  */
 int
-cgthreematch(parent, cf, aux)
+cgthreematch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c
index d7a4041f6d98..b28b6555fe30 100644
--- a/sys/arch/sparc/dev/dma.c
+++ b/sys/arch/sparc/dev/dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma.c,v 1.5 1994/11/20 20:52:05 deraadt Exp $ */
+/*	$NetBSD: dma.c,v 1.6 1994/11/23 07:02:09 deraadt Exp $ */
 
 /*
  * Copyright (c) 1994 Peter Galbavy.  All rights reserved.
@@ -54,7 +54,7 @@
 
 int dmaprint		__P((void *, char *));
 void dmaattach		__P((struct device *, struct device *, void *));
-int dmamatch		__P((struct device *, struct cfdata *, void *));
+int dmamatch		__P((struct device *, void *, void *));
 void dma_reset		__P((struct dma_softc *));
 void dma_enintr		__P((struct dma_softc *));
 int dma_isintr		__P((struct dma_softc *));
@@ -85,11 +85,11 @@ dmaprint(aux, name)
 }
 
 int
-dmamatch(parent, cf, aux)
+dmamatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 	register struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c
index ed5f71f1af05..cf82cac21f4a 100644
--- a/sys/arch/sparc/dev/esp.c
+++ b/sys/arch/sparc/dev/esp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp.c,v 1.13 1994/11/21 01:56:38 deraadt Exp $ */
+/*	$NetBSD: esp.c,v 1.14 1994/11/23 07:02:12 deraadt Exp $ */
 
 /*
  * Copyright (c) 1994 Peter Galbavy
@@ -65,7 +65,7 @@
 int esp_debug = ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS; /**/ 
 
 void	espattach	__P((struct device *, struct device *, void *));
-int	espmatch	__P((struct device *, struct cfdata *, void *));
+int	espmatch	__P((struct device *, void *, void *));
 void	esp_minphys	__P((struct buf *));
 u_int	esp_adapter_info __P((struct esp_softc *));
 int	espprint	__P((void *, char *));
@@ -217,11 +217,11 @@ espselect(sc, target, lun, cmd, clen)
 }
 
 int
-espmatch(parent, cf, aux)
+espmatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 	register struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c
index b44af697adca..8fff4b7eac81 100644
--- a/sys/arch/sparc/dev/if_le.c
+++ b/sys/arch/sparc/dev/if_le.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.16 1994/11/20 20:52:21 deraadt Exp $ */
+/*	$NetBSD: if_le.c,v 1.17 1994/11/23 07:02:15 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
@@ -147,7 +147,7 @@ struct le_softc {
 
 /* autoconfiguration driver */
 void	leattach(struct device *, struct device *, void *);
-int	lematch(struct device *, struct cfdata *, void *);
+int	lematch(struct device *, void *, void *);
 struct	cfdriver lecd =
     { NULL, "le", lematch, leattach, DV_IFNET, sizeof(struct le_softc) };
 
@@ -169,11 +169,11 @@ void	lererror(struct le_softc *, char *);
 void	lexerror(struct le_softc *);
 
 int
-lematch(parent, cf, aux)
+lematch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 	register struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c
index 92674491fec5..f342b752605c 100644
--- a/sys/arch/sparc/dev/obio.c
+++ b/sys/arch/sparc/dev/obio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.8 1994/11/05 09:28:06 deraadt Exp $	*/
+/*	$NetBSD: obio.c,v 1.9 1994/11/23 07:02:17 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Theo de Raadt
@@ -55,10 +55,10 @@ struct bus_softc {
 };
 
 /* autoconfiguration driver */
-static int	busmatch(struct device *, struct cfdata *, void *);
-static void	obioattach(struct device *, struct device *, void *);
-static void	vmesattach(struct device *, struct device *, void *);
-static void	vmelattach(struct device *, struct device *, void *);
+static int	busmatch __P((struct device *, void *, void *));
+static void	obioattach __P((struct device *, struct device *, void *));
+static void	vmesattach __P((struct device *, struct device *, void *));
+static void	vmelattach __P((struct device *, struct device *, void *));
 
 struct cfdriver obiocd = { NULL, "obio", busmatch, obioattach,
 	DV_DULL, sizeof(struct bus_softc)
@@ -70,18 +70,18 @@ struct cfdriver vmescd = { NULL, "vmes", busmatch, vmesattach,
 	DV_DULL, sizeof(struct bus_softc)
 };
 
-static void	busattach(struct device *, struct device *, void *, int);
+static void	busattach __P((struct device *, struct device *, void *, int));
 
 void *		bus_map __P((void *, int, int));
 void *		bus_tmp __P((void *, int));
 void		bus_untmp __P((void));
 
 int
-busmatch(parent, cf, aux)
+busmatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 	register struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c
index a9170b93e0bb..6f7dd23378e7 100644
--- a/sys/arch/sparc/dev/sbus.c
+++ b/sys/arch/sparc/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbus.c,v 1.4 1994/11/20 20:52:25 deraadt Exp $ */
+/*	$NetBSD: sbus.c,v 1.5 1994/11/23 07:02:19 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
 
 /* autoconfiguration driver */
 void	sbus_attach __P((struct device *, struct device *, void *));
-int	sbus_match __P((struct device *, struct cfdata *, void *));
+int	sbus_match __P((struct device *, void *, void *));
 struct cfdriver sbuscd = {
 	NULL, "sbus", sbus_match, sbus_attach,
 	DV_DULL, sizeof(struct sbus_softc)
@@ -84,11 +84,11 @@ sbus_print(args, sbus)
 }
 
 int
-sbus_match(parent, cf, aux)
+sbus_match(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 	register struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 069ae07b64bb..4f9ab6100010 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.18 1994/11/20 20:52:28 deraadt Exp $ */
+/*	$NetBSD: zs.c,v 1.19 1994/11/23 07:02:21 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -113,7 +113,7 @@ struct zsinfo {
 struct tty *zs_tty[NZS * 2];		/* XXX should be dynamic */
 
 /* Definition of the driver for autoconfig. */
-static int	zsmatch __P((struct device *, struct cfdata *, void *));
+static int	zsmatch __P((struct device *, void *, void *));
 static void	zsattach __P((struct device *, struct device *, void *));
 struct cfdriver zscd =
     { NULL, "zs", zsmatch, zsattach, DV_TTY, sizeof(struct zsinfo) };
@@ -204,11 +204,11 @@ zs_write(zc, reg, val)
  * not set up the keyboard as ttya, etc.
  */
 static int
-zsmatch(parent, cf, aux)
+zsmatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *vcf, *aux;
 {
+	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 	struct romaux *ra = &ca->ca_ra;
 
diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h
index 17fe1c8a2d4a..1a0be40cca6a 100644
--- a/sys/arch/sparc/include/autoconf.h
+++ b/sys/arch/sparc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.h,v 1.6 1994/11/20 20:52:52 deraadt Exp $ */
+/*	$NetBSD: autoconf.h,v 1.7 1994/11/23 07:02:30 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -112,7 +112,7 @@ int	romprop __P((struct romaux *ra, const char *name, int node));
  * its aux pointer to point to a pointer to the name (the address of
  * a romaux structure suffices, for instance).
  */
-int	matchbyname __P((struct device *, struct cfdata *cf, void *aux));
+int	matchbyname __P((struct device *, void *cf, void *aux));
 
 /*
  * `clockfreq' produces a printable representation of a clock frequency
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index 3d54a0485097..36307d6fc047 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.17 1994/11/20 20:53:57 deraadt Exp $ */
+/*	$NetBSD: autoconf.c,v 1.18 1994/11/23 07:02:36 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -94,11 +94,11 @@ struct	bootpath bootpath[8];
  * device names with our internal names.
  */
 int
-matchbyname(parent, cf, aux)
+matchbyname(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *aux, *vcf;
 {
+	struct cfdata *cf = vcf;
 	struct confargs *ca = aux;
 
 #if defined(SUN4)
diff --git a/sys/arch/sparc/sparc/auxreg.c b/sys/arch/sparc/sparc/auxreg.c
index 7b6054dd6db6..46b4392623c3 100644
--- a/sys/arch/sparc/sparc/auxreg.c
+++ b/sys/arch/sparc/sparc/auxreg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: auxreg.c,v 1.5 1994/11/20 20:53:58 deraadt Exp $ */
+/*	$NetBSD: auxreg.c,v 1.6 1994/11/23 07:02:38 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/auxreg.h>
 
-static int auxregmatch __P((struct device *, struct cfdata *, void *));
+static int auxregmatch __P((struct device *, void *, void *));
 static void auxregattach __P((struct device *, struct device *, void *));
 struct cfdriver auxregcd =
     { 0, "auxreg", auxregmatch, auxregattach, DV_DULL, sizeof(struct device) };
@@ -85,12 +85,12 @@ blink(zero)
  * The OPENPROM calls this "auxiliary-io".
  */
 static int
-auxregmatch(parent, cf, aux)
+auxregmatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *aux, *vcf;
 {
 	register struct confargs *ca = aux;
+	struct cfdata *cf = vcf;
 
 	if (cputyp==CPU_SUN4)
 		return (0);
diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c
index 66d24357734f..fb4f7fe20342 100644
--- a/sys/arch/sparc/sparc/clock.c
+++ b/sys/arch/sparc/sparc/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.13 1994/11/20 20:54:05 deraadt Exp $ */
+/*	$NetBSD: clock.c,v 1.14 1994/11/23 07:02:40 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -83,13 +83,13 @@ int statvar = 8192;
 int statmin;			/* statclock interval - 1/2*variance */
 int timerok;
 
-static int clockmatch __P((struct device *, struct cfdata *, void *));
+static int clockmatch __P((struct device *, void *, void *));
 static void clockattach __P((struct device *, struct device *, void *));
 
 struct cfdriver clockcd =
     { NULL, "clock", clockmatch, clockattach, DV_DULL, sizeof(struct device) };
 
-static int timermatch __P((struct device *, struct cfdata *, void *));
+static int timermatch __P((struct device *, void *, void *));
 static void timerattach __P((struct device *, struct device *, void *));
 struct cfdriver timercd =
     { NULL, "timer", timermatch, timerattach, DV_DULL, sizeof(struct device) };
@@ -99,11 +99,11 @@ struct cfdriver timercd =
  * own special match function to call it the "clock".
  */
 static int
-clockmatch(parent, cf, aux)
+clockmatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *aux, *vcf;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 
 	if (cputyp==CPU_SUN4)
@@ -176,11 +176,11 @@ clockattach(parent, self, aux)
  * The OPENPROM calls the timer the "counter-timer".
  */
 static int
-timermatch(parent, cf, aux)
+timermatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *aux, *vcf;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 
 	if (cputyp==CPU_SUN4)
diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c
index 0d81bd784ad3..d44a50c3bfa7 100644
--- a/sys/arch/sparc/sparc/cpu.c
+++ b/sys/arch/sparc/sparc/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.12 1994/11/20 20:54:10 deraadt Exp $ */
+/*	$NetBSD: cpu.c,v 1.13 1994/11/23 07:02:42 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -68,7 +68,7 @@ char	cpu_model[100];
 
 /* The CPU configuration driver. */
 static void cpu_attach __P((struct device *, struct device *, void *));
-int  cpu_match __P((struct device *, struct cfdata *, void *));
+int  cpu_match __P((struct device *, void *, void *));
 
 struct cfdriver cpucd =
     { NULL, "cpu", cpu_match, cpu_attach, DV_CPU, sizeof(struct device) };
@@ -105,11 +105,11 @@ static char *iu_vendor[16] = {
 #endif
 
 int
-cpu_match(parent, cf, aux)
+cpu_match(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *aux, *vcf;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 
 	return (strcmp(cf->cf_driver->cd_name, ca->ca_ra.ra_name) == 0);
diff --git a/sys/arch/sparc/sparc/memreg.c b/sys/arch/sparc/sparc/memreg.c
index bb601aba61c4..d355aefb1b3f 100644
--- a/sys/arch/sparc/sparc/memreg.c
+++ b/sys/arch/sparc/sparc/memreg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: memreg.c,v 1.5 1994/11/20 20:54:32 deraadt Exp $ */
+/*	$NetBSD: memreg.c,v 1.6 1994/11/23 07:02:45 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
 #include <sparc/sparc/memreg.h>
 #include <sparc/sparc/vaddrs.h>
 
-static int memregmatch __P((struct device *, struct cfdata *, void *));
+static int memregmatch __P((struct device *, void *, void *));
 static void memregattach __P((struct device *, struct device *, void *));
 struct cfdriver memregcd =
     { 0, "memreg", memregmatch, memregattach, DV_DULL, sizeof(struct device) };
@@ -62,11 +62,11 @@ struct cfdriver memregcd =
  * The OPENPROM calls this "memory-error".
  */
 static int
-memregmatch(parent, cf, aux)
+memregmatch(parent, vcf, aux)
 	struct device *parent;
-	struct cfdata *cf;
-	void *aux;
+	void *aux, *vcf;
 {
+	struct cfdata *cf = vcf;
 	register struct confargs *ca = aux;
 
 	if (cputyp==CPU_SUN4) {