summaryrefslogtreecommitdiff
path: root/sys/arch/mac68k/dev/grf.c
diff options
context:
space:
mode:
authorbriggs <briggs@cvs.openbsd.org>1997-01-24 01:35:55 +0000
committerbriggs <briggs@cvs.openbsd.org>1997-01-24 01:35:55 +0000
commit2cf4fbaafa89ff9455907432816daebe394b533b (patch)
tree14fe32451db6302b379b04d7ca3df0c07d26dce7 /sys/arch/mac68k/dev/grf.c
parent2ebc04f559b55bc6705d62e51a00406bee8ef115 (diff)
Sync w/ NETBSD_CURRENT_971122.
Diffstat (limited to 'sys/arch/mac68k/dev/grf.c')
-rw-r--r--sys/arch/mac68k/dev/grf.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c
index cd782fe1412..162fad5c60a 100644
--- a/sys/arch/mac68k/dev/grf.c
+++ b/sys/arch/mac68k/dev/grf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: grf.c,v 1.4 1996/08/10 21:37:43 briggs Exp $ */
-/* $NetBSD: grf.c,v 1.35 1996/08/05 01:26:31 scottr Exp $ */
+/* $OpenBSD: grf.c,v 1.5 1997/01/24 01:35:29 briggs Exp $ */
+/* $NetBSD: grf.c,v 1.39 1996/12/16 16:17:05 scottr Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -82,7 +82,7 @@
#define iteoff(u,f)
#endif
-int grfmatch __P((struct device *, void *, void *));
+int grfmatch __P((struct device *, struct cfdata *, void *));
void grfattach __P((struct device *, struct device *, void *));
struct cfdriver grf_cd = {
@@ -102,9 +102,10 @@ static int grfdebug = (GDB_DEVNO|GDB_MMAP|GDB_IOMAP|GDB_LOCK);
#endif
int
-grfmatch(parent, match, aux)
+grfmatch(parent, cf, aux)
struct device *parent;
- void *match, *aux;
+ struct cfdata *cf;
+ void *aux;
{
struct grfbus_attach_args *ga = aux;