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/mac68k/dev/ncr5380.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/mac68k/dev/ncr5380.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.47.2.1
retrieving revision 1.48
diff -u -p -r1.47.2.1 -r1.48
--- src/sys/arch/mac68k/dev/ncr5380.c	2002/10/10 18:33:46	1.47.2.1
+++ src/sys/arch/mac68k/dev/ncr5380.c	2002/09/27 15:36:16	1.48
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr5380.c,v 1.47.2.1 2002/10/10 18:33:46 jdolecek Exp $	*/
+/*	$NetBSD: ncr5380.c,v 1.48 2002/09/27 15:36:16 provos Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -196,10 +196,10 @@ int	ncr_match __P((struct device *, stru
 #define CFNAME(n)	__CONCAT(n,_cd)
 #define CANAME(n)	__CONCAT(n,_ca)
 #define CFSTRING(n)	__STRING(n)
-#define	CFDRNAME(n)	n
 
-CFATTACH_DECL(CFDRNAME(DRNAME), sizeof(struct ncr_softc),
-    ncr_match, ncr_attach, NULL, NULL);
+struct cfattach CANAME(DRNAME) = {
+	sizeof(struct ncr_softc), ncr_match, ncr_attach
+};
 
 extern struct cfdriver CFNAME(DRNAME);