diff --git a/sys/arch/acorn26/acorn26/cpu.c b/sys/arch/acorn26/acorn26/cpu.c index 11847dc53498..73691fc71690 100644 --- a/sys/arch/acorn26/acorn26/cpu.c +++ b/sys/arch/acorn26/acorn26/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.7 2002/10/02 03:18:07 thorpej Exp $ */ +/* $NetBSD: cpu.c,v 1.8 2002/10/02 03:25:46 thorpej Exp $ */ /*- * Copyright (c) 2000, 2001 Ben Harris @@ -32,7 +32,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.7 2002/10/02 03:18:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.8 2002/10/02 03:25:46 thorpej Exp $"); #include #include @@ -68,7 +68,7 @@ struct cpu_softc { }; CFATTACH_DECL(cpu_root, sizeof(struct cpu_softc), - cpu_match, cpu_attach, NULL, NULL); + cpu_match, cpu_attach, NULL, NULL); /* cf_flags bits */ #define CFF_NOCACHE 0x00000001 diff --git a/sys/arch/acorn26/acorn26/fpu.c b/sys/arch/acorn26/acorn26/fpu.c index 0e78a2cda7c8..6e94ed1cad7b 100644 --- a/sys/arch/acorn26/acorn26/fpu.c +++ b/sys/arch/acorn26/acorn26/fpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.4 2002/10/02 02:21:20 thorpej Exp $ */ +/* $NetBSD: fpu.c,v 1.5 2002/10/02 03:25:46 thorpej Exp $ */ /*- * Copyright (c) 2000, 2001 Ben Harris @@ -32,7 +32,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.4 2002/10/02 02:21:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.5 2002/10/02 03:25:46 thorpej Exp $"); #include #include @@ -52,7 +52,7 @@ static void fpu_attach(struct device *, struct device *, void *); static register_t fpu_identify(void); CFATTACH_DECL(fpu, sizeof(struct fpu_softc), - fpu_match, fpu_attach, NULL, NULL); + fpu_match, fpu_attach, NULL, NULL); struct fpu_softc *the_fpu; diff --git a/sys/arch/acorn26/iobus/iobus.c b/sys/arch/acorn26/iobus/iobus.c index 7db2acad7a8d..a313bfbc1167 100644 --- a/sys/arch/acorn26/iobus/iobus.c +++ b/sys/arch/acorn26/iobus/iobus.c @@ -1,4 +1,4 @@ -/* $NetBSD: iobus.c,v 1.6 2002/10/02 02:21:20 thorpej Exp $ */ +/* $NetBSD: iobus.c,v 1.7 2002/10/02 03:25:46 thorpej Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. @@ -31,7 +31,7 @@ #include -__RCSID("$NetBSD: iobus.c,v 1.6 2002/10/02 02:21:20 thorpej Exp $"); +__RCSID("$NetBSD: iobus.c,v 1.7 2002/10/02 03:25:46 thorpej Exp $"); #include #include @@ -54,7 +54,7 @@ struct iobus_softc { }; CFATTACH_DECL(iobus, sizeof(struct iobus_softc), - iobus_match, iobus_attach, NULL, NULL); + iobus_match, iobus_attach, NULL, NULL); struct iobus_softc *the_iobus; diff --git a/sys/arch/acorn26/iobus/ioc.c b/sys/arch/acorn26/iobus/ioc.c index fed430426bf1..7088dba5e2d3 100644 --- a/sys/arch/acorn26/iobus/ioc.c +++ b/sys/arch/acorn26/iobus/ioc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ioc.c,v 1.5 2002/10/02 02:21:20 thorpej Exp $ */ +/* $NetBSD: ioc.c,v 1.6 2002/10/02 03:25:46 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris @@ -32,7 +32,7 @@ #include -__RCSID("$NetBSD: ioc.c,v 1.5 2002/10/02 02:21:20 thorpej Exp $"); +__RCSID("$NetBSD: ioc.c,v 1.6 2002/10/02 03:25:46 thorpej Exp $"); #include #include @@ -59,7 +59,7 @@ static int ioc_irq_clock(void *cookie); static int ioc_irq_statclock(void *cookie); CFATTACH_DECL(ioc, sizeof(struct ioc_softc), - ioc_match, ioc_attach, NULL, NULL); + ioc_match, ioc_attach, NULL, NULL); struct device *the_ioc; diff --git a/sys/arch/acorn26/iobus/upc_iobus.c b/sys/arch/acorn26/iobus/upc_iobus.c index 1edd6492722e..49c1e2978931 100644 --- a/sys/arch/acorn26/iobus/upc_iobus.c +++ b/sys/arch/acorn26/iobus/upc_iobus.c @@ -1,4 +1,4 @@ -/* $NetBSD: upc_iobus.c,v 1.4 2002/10/02 02:21:20 thorpej Exp $ */ +/* $NetBSD: upc_iobus.c,v 1.5 2002/10/02 03:25:46 thorpej Exp $ */ /*- * Copyright (c) 2000 Ben Harris * All rights reserved. @@ -31,7 +31,7 @@ #include -__RCSID("$NetBSD: upc_iobus.c,v 1.4 2002/10/02 02:21:20 thorpej Exp $"); +__RCSID("$NetBSD: upc_iobus.c,v 1.5 2002/10/02 03:25:46 thorpej Exp $"); #include @@ -61,7 +61,7 @@ struct upc_iobus_softc { }; CFATTACH_DECL(upc_iobus, sizeof(struct upc_iobus_softc), - upc_iobus_match, upc_iobus_attach, NULL, NULL); + upc_iobus_match, upc_iobus_attach, NULL, NULL); static struct device *the_upc_iobus; diff --git a/sys/arch/acorn26/ioc/arckbd.c b/sys/arch/acorn26/ioc/arckbd.c index 345031183c1d..3a2fd9cb3698 100644 --- a/sys/arch/acorn26/ioc/arckbd.c +++ b/sys/arch/acorn26/ioc/arckbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: arckbd.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: arckbd.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 Ben Harris * All rights reserved. @@ -42,7 +42,7 @@ #include -__RCSID("$NetBSD: arckbd.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $"); +__RCSID("$NetBSD: arckbd.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -165,7 +165,7 @@ struct arckbd_softc { #define AKF_POLLING 0x10 CFATTACH_DECL(arckbd, sizeof(struct arckbd_softc), - arckbd_match, arckbd_attach, NULL, NULL); + arckbd_match, arckbd_attach, NULL, NULL); /* * Internal devices used because arckbd can't be both a wskbddev and a @@ -177,13 +177,13 @@ CFATTACH_DECL(arckbd, sizeof(struct arckbd_softc), */ #if NARCWSKBD > 0 -CFATTACH_DECL(arcwskbd, sizeof(struct arcwskbd_softc), - arcwskbd_match, arcwskbd_attach, NULL, NULL); +CFATTACH_DECL(arcwskbd, sizeof(struct device), + arcwskbd_match, arcwskbd_attach, NULL, NULL); #endif #if NARCWSMOUSE > 0 -CFATTACH_DECL(arcwsmouse, sizeof(struct arcwsmouse_softc), - arcwsmouse_match, arcwsmouse_attach, NULL, NULL); +CFATTACH_DECL(arcwsmouse, sizeof(struct device), + arcwsmouse_match, arcwsmouse_attach, NULL, NULL); #endif struct arckbd_attach_args { diff --git a/sys/arch/acorn26/ioc/arcpp.c b/sys/arch/acorn26/ioc/arcpp.c index 5de6142e45e1..90adc3bd7d92 100644 --- a/sys/arch/acorn26/ioc/arcpp.c +++ b/sys/arch/acorn26/ioc/arcpp.c @@ -1,4 +1,4 @@ -/* $NetBSD: arcpp.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: arcpp.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -52,7 +52,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -123,7 +123,7 @@ static int arcppintr(void *); static int arcpppushbytes(struct arcpp_softc *); CFATTACH_DECL(arcpp, sizeof(struct arcpp_softc), - arcpp_match, arcpp_attach, NULL, NULL); + arcpp_match, arcpp_attach, NULL, NULL); static int arcpp_match(struct device *parent, struct cfdata *cf, void *aux) diff --git a/sys/arch/acorn26/ioc/if_eca.c b/sys/arch/acorn26/ioc/if_eca.c index 31b9b3b247f5..c658ee9e7ba4 100644 --- a/sys/arch/acorn26/ioc/if_eca.c +++ b/sys/arch/acorn26/ioc/if_eca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eca.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: if_eca.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -29,7 +29,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_eca.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -74,7 +74,7 @@ static void eca_gotframe(void *); struct eca_softc *eca_fiqowner; CFATTACH_DECL(eca, sizeof(struct eca_softc), - eca_match, eca_attach, NULL, NULL); + eca_match, eca_attach, NULL, NULL); static int eca_match(struct device *parent, struct cfdata *cf, void *aux) diff --git a/sys/arch/acorn26/ioc/iic.c b/sys/arch/acorn26/ioc/iic.c index ab7109dcf5ea..385477f7e127 100644 --- a/sys/arch/acorn26/ioc/iic.c +++ b/sys/arch/acorn26/ioc/iic.c @@ -1,4 +1,4 @@ -/* $NetBSD: iic.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: iic.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -47,7 +47,7 @@ #include -__RCSID("$NetBSD: iic.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $"); +__RCSID("$NetBSD: iic.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -73,7 +73,7 @@ static void iic_attach(struct device *, struct device *, void *); static int iicsearch(struct device *, struct cfdata *, void *); CFATTACH_DECL(iic, sizeof(struct iic_softc), - iic_match, iic_attach, NULL, NULL); + iic_match, iic_attach, NULL, NULL); /* Local function prototypes */ diff --git a/sys/arch/acorn26/ioc/ioeb.c b/sys/arch/acorn26/ioc/ioeb.c index cc57c2c321e3..7225bdb51179 100644 --- a/sys/arch/acorn26/ioc/ioeb.c +++ b/sys/arch/acorn26/ioc/ioeb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ioeb.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: ioeb.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -29,7 +29,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -50,7 +50,7 @@ static int ioeb_match(struct device *, struct cfdata *, void *); static void ioeb_attach(struct device *, struct device *, void *); CFATTACH_DECL(ioeb, sizeof(struct ioeb_softc), - ioeb_match, ioeb_attach, NULL, NULL); + ioeb_match, ioeb_attach, NULL, NULL); struct device *the_ioeb; diff --git a/sys/arch/acorn26/ioc/latches.c b/sys/arch/acorn26/ioc/latches.c index bca9c3462c61..e9836b599966 100644 --- a/sys/arch/acorn26/ioc/latches.c +++ b/sys/arch/acorn26/ioc/latches.c @@ -1,4 +1,4 @@ -/* $NetBSD: latches.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: latches.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2001 Ben Harris @@ -29,7 +29,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: latches.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -55,7 +55,7 @@ static int latches_match(struct device *, struct cfdata *, void *); static void latches_attach(struct device *, struct device *, void *); CFATTACH_DECL(latches, sizeof(struct latches_softc), - latches_match, latches_attach, NULL, NULL); + latches_match, latches_attach, NULL, NULL); struct device *the_latches; diff --git a/sys/arch/acorn26/ioc/rtc.c b/sys/arch/acorn26/ioc/rtc.c index df00057ea46a..a2ee8e045f40 100644 --- a/sys/arch/acorn26/ioc/rtc.c +++ b/sys/arch/acorn26/ioc/rtc.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: rtc.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $ */ /* * Copyright (c) 2000 Ben Harris @@ -45,7 +45,7 @@ #include -__RCSID("$NetBSD: rtc.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $"); +__RCSID("$NetBSD: rtc.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -87,7 +87,7 @@ struct rtc_softc *the_rtc; /* device and attach structures */ CFATTACH_DECL(rtc, sizeof(struct rtc_softc), - rtcmatch, rtcattach, NULL, NULL); + rtcmatch, rtcattach, NULL, NULL); /* * rtcmatch() diff --git a/sys/arch/acorn26/ioc/ssn.c b/sys/arch/acorn26/ioc/ssn.c index 7e54f06e94f2..77939d8290fe 100644 --- a/sys/arch/acorn26/ioc/ssn.c +++ b/sys/arch/acorn26/ioc/ssn.c @@ -1,4 +1,4 @@ -/* $NetBSD: ssn.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: ssn.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2002 Ben Harris @@ -29,7 +29,7 @@ #include -__RCSID("$NetBSD: ssn.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $"); +__RCSID("$NetBSD: ssn.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -52,7 +52,7 @@ static int ssn_match(struct device *, struct cfdata *, void *); static void ssn_attach(struct device *, struct device *, void *); CFATTACH_DECL(ssn, sizeof(struct ssn_softc), - ssn_match, ssn_attach, NULL, NULL); + ssn_match, ssn_attach, NULL, NULL); static int ds_ioc_read_bit(void *); static void ds_ioc_write_bit(void *, int); diff --git a/sys/arch/acorn26/podulebus/if_eh.c b/sys/arch/acorn26/podulebus/if_eh.c index 9a4cad257563..13640ed42f2b 100644 --- a/sys/arch/acorn26/podulebus/if_eh.c +++ b/sys/arch/acorn26/podulebus/if_eh.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eh.c,v 1.5 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: if_eh.c,v 1.6 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -52,7 +52,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.5 2002/10/02 02:21:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.6 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -135,7 +135,7 @@ static int eh_match(struct device *, struct cfdata *, void *); static void eh_attach(struct device *, struct device *, void *); CFATTACH_DECL(eh, sizeof(struct eh_softc), - eh_match, eh_attach, NULL, NULL); + eh_match, eh_attach, NULL, NULL); static int eh_match(struct device *parent, struct cfdata *cf, void *aux) diff --git a/sys/arch/acorn26/podulebus/podulebus.c b/sys/arch/acorn26/podulebus/podulebus.c index 357472335d6d..89320da89861 100644 --- a/sys/arch/acorn26/podulebus/podulebus.c +++ b/sys/arch/acorn26/podulebus/podulebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: podulebus.c,v 1.6 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: podulebus.c,v 1.7 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -29,7 +29,7 @@ #include -__RCSID("$NetBSD: podulebus.c,v 1.6 2002/10/02 02:21:21 thorpej Exp $"); +__RCSID("$NetBSD: podulebus.c,v 1.7 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -75,7 +75,7 @@ struct podulebus_softc { }; CFATTACH_DECL(podulebus, sizeof(struct podulebus_softc), - podulebus_match, podulebus_attach, NULL, NULL); + podulebus_match, podulebus_attach, NULL, NULL); /* ARGSUSED */ static int diff --git a/sys/arch/acorn26/podulebus/powerrom.c b/sys/arch/acorn26/podulebus/powerrom.c index d1856a8a01f4..ce1f30e1c24e 100644 --- a/sys/arch/acorn26/podulebus/powerrom.c +++ b/sys/arch/acorn26/podulebus/powerrom.c @@ -1,10 +1,10 @@ -/* $NetBSD: powerrom.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: powerrom.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $ */ /* Test driver to see if we can talk to PowerROMs */ #include -__KERNEL_RCSID(0, "$NetBSD: powerrom.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: powerrom.c,v 1.4 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -14,8 +14,8 @@ __KERNEL_RCSID(0, "$NetBSD: powerrom.c,v 1.3 2002/10/02 02:21:21 thorpej Exp $") int powerrom_match(struct device *, struct cfdata *, void *); void powerrom_attach(struct device *, struct device *, void *); -CFATTACH_DECL(powerrom, sizeof(struct powerrom_softc), - powerrom_match, powerrom_attach, NULL, NULL); +CFATTACH_DECL(powerrom, sizeof(struct device), + powerrom_match, powerrom_attach, NULL, NULL); int powerrom_match(struct device *parent, struct cfdata *cf, void *aux) diff --git a/sys/arch/acorn26/podulebus/unixbp.c b/sys/arch/acorn26/podulebus/unixbp.c index 254436d71ee8..93acf0951b1c 100644 --- a/sys/arch/acorn26/podulebus/unixbp.c +++ b/sys/arch/acorn26/podulebus/unixbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: unixbp.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $ */ +/* $NetBSD: unixbp.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $ */ /*- * Copyright (c) 2000 Ben Harris @@ -32,7 +32,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: unixbp.c,v 1.4 2002/10/02 02:21:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: unixbp.c,v 1.5 2002/10/02 03:25:47 thorpej Exp $"); #include #include @@ -51,7 +51,7 @@ static int unixbp_match(struct device *, struct cfdata *, void *); static void unixbp_attach(struct device *, struct device *, void *); CFATTACH_DECL(unixbp, sizeof(struct unixbp_softc), - unixbp_match, unixbp_attach, NULL, NULL); + unixbp_match, unixbp_attach, NULL, NULL); struct device *the_unixbp; diff --git a/sys/arch/acorn26/vidc/arcvideo.c b/sys/arch/acorn26/vidc/arcvideo.c index 10ed9112f7ca..ad9e4384c537 100644 --- a/sys/arch/acorn26/vidc/arcvideo.c +++ b/sys/arch/acorn26/vidc/arcvideo.c @@ -1,4 +1,4 @@ -/* $NetBSD: arcvideo.c,v 1.5 2002/10/02 02:21:22 thorpej Exp $ */ +/* $NetBSD: arcvideo.c,v 1.6 2002/10/02 03:26:28 thorpej Exp $ */ /*- * Copyright (c) 1998, 2000 Ben Harris * All rights reserved. @@ -38,7 +38,7 @@ #include -__RCSID("$NetBSD: arcvideo.c,v 1.5 2002/10/02 02:21:22 thorpej Exp $"); +__RCSID("$NetBSD: arcvideo.c,v 1.6 2002/10/02 03:26:28 thorpej Exp $"); #include #include @@ -98,7 +98,7 @@ struct arcvideo_softc { }; CFATTACH_DECL(arcvideo, sizeof(struct arcvideo_softc), - arcvideo_match, arcvideo_attach, NULL, NULL); + arcvideo_match, arcvideo_attach, NULL, NULL); struct device *the_arcvideo;