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/dev/acpi/acpi.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/acpi/acpi.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.5.2.5 retrieving revision 1.5.2.6 diff -u -p -r1.5.2.5 -r1.5.2.6 --- src/sys/dev/acpi/acpi.c 2002/09/06 08:43:48 1.5.2.5 +++ src/sys/dev/acpi/acpi.c 2002/10/10 18:38:23 1.5.2.6 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.5.2.5 2002/09/06 08:43:48 jdolecek Exp $ */ +/* $NetBSD: acpi.c,v 1.5.2.6 2002/10/10 18:38:23 jdolecek Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.5.2.5 2002/09/06 08:43:48 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.5.2.6 2002/10/10 18:38:23 jdolecek Exp $"); #include #include @@ -85,9 +85,8 @@ int acpi_print(void *aux, const char *); extern struct cfdriver acpi_cd; -struct cfattach acpi_ca = { - sizeof(struct acpi_softc), acpi_match, acpi_attach, -}; +CFATTACH_DECL(acpi, sizeof(struct acpi_softc), + acpi_match, acpi_attach, NULL, NULL); /* * This is a flag we set when the ACPI subsystem is active. Machine