Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/pmax/tc/mcclock_ioasic.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/pmax/tc/mcclock_ioasic.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.14.8.2
diff -u -p -r1.14 -r1.14.8.2
--- src/sys/arch/pmax/tc/mcclock_ioasic.c	2000/01/10 03:24:41	1.14
+++ src/sys/arch/pmax/tc/mcclock_ioasic.c	2002/10/10 18:35:10	1.14.8.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: mcclock_ioasic.c,v 1.14 2000/01/10 03:24:41 simonb Exp $ */
+/*	$NetBSD: mcclock_ioasic.c,v 1.14.8.2 2002/10/10 18:35:10 jdolecek Exp $ */
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,10 +28,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.14 2000/01/10 03:24:41 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.14.8.2 2002/10/10 18:35:10 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
+#include <sys/systm.h>
 
 #include <dev/dec/mcclockvar.h>
 #include <dev/dec/mcclock_pad32.h>
@@ -44,12 +45,8 @@ static int	mcclock_ioasic_match __P((str
 static void	mcclock_ioasic_attach __P((struct device *, struct device *,
 		    void *));
 
-struct cfattach mcclock_ioasic_ca = {
-	sizeof (struct mcclock_pad32_softc),
-	mcclock_ioasic_match, mcclock_ioasic_attach, 
-};
-extern struct cfdriver ioasic_cd;
-
+CFATTACH_DECL(mcclock_ioasic, sizeof (struct mcclock_pad32_softc),
+    mcclock_ioasic_match, mcclock_ioasic_attach, NULL, NULL);
 
 static int
 mcclock_ioasic_match(parent, match, aux)
@@ -59,9 +56,6 @@ mcclock_ioasic_match(parent, match, aux)
 {
 	struct ioasicdev_attach_args *d = aux;
 
-	if (parent->dv_cfdata->cf_driver != &ioasic_cd)
-		return 0;
-
 	if (strcmp("mc146818", d->iada_modname) != 0)
 		return (0);