partial sync with netbsd 960418, more to come

1 files changed, 13 insertions, 8 deletions

diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c
index ac6c11e24c7..7979bd4de62 100644
--- a/sys/arch/amiga/dev/grf.c
+++ b/sys/arch/amiga/dev/grf.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: grf.c,v 1.23.2.1 1995/10/20 11:01:06 chopps Exp $	*/
+/*	$OpenBSD: grf.c,v 1.3 1996/04/21 22:15:08 deraadt Exp $	*/
+/*	$NetBSD: grf.c,v 1.25 1996/03/17 01:17:09 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -97,17 +98,20 @@ int grfbanked_set __P((dev_t, int));
 #endif
 
 void grfattach __P((struct device *, struct device *, void *));
-int grfmatch __P((struct device *, struct cfdata *, void *));
+int grfmatch __P((struct device *, void *, void *));
 int grfprint __P((void *, char *));
 /*
  * pointers to grf drivers device structs 
  */
 struct grf_softc *grfsp[NGRF];
 
+struct cfattach grf_ca = {
+	sizeof(struct device), grfmatch, grfattach
+};
 
-struct cfdriver grfcd = {
-	NULL, "grf", (cfmatch_t)grfmatch, grfattach, DV_DULL,
-	sizeof(struct device), NULL, 0 };
+struct cfdriver grf_cd = {
+	NULL, "grf", DV_DULL, NULL, 0
+};
 
 /*
  * only used in console init.
@@ -119,11 +123,12 @@ static struct cfdata *cfdata;
  * low level board driver.
  */
 int
-grfmatch(pdp, cfp, auxp)
+grfmatch(pdp, match, auxp)
 	struct device *pdp;
-	struct cfdata *cfp;
-	void *auxp;
+	void *match, *auxp;
 {
+	struct cfdata *cfp = match;
+
 	if (cfp->cf_unit != ((struct grf_softc *)pdp)->g_unit)
 		return(0);
 	cfdata = cfp;