Module Name: src
Committed By: cegger
Date: Tue May 12 10:16:35 UTC 2009
Modified Files:
src/sys/dev/isapnp: aha_isapnp.c aic_isapnp.c gus_isapnp.c
i82365_isapnp.c if_an_isapnp.c if_cs_isapnp.c if_tr_isapnp.c
isic_isapnp.c isic_isapnp_dynalink.c wss_isapnp.c ym_isapnp.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/isapnp/aha_isapnp.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/isapnp/aic_isapnp.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/isapnp/i82365_isapnp.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/isapnp/if_an_isapnp.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/isapnp/if_cs_isapnp.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/isapnp/if_tr_isapnp.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/isapnp/isic_isapnp.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/isapnp/isic_isapnp_dynalink.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/isapnp/wss_isapnp.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/isapnp/ym_isapnp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isapnp/aha_isapnp.c
diff -u src/sys/dev/isapnp/aha_isapnp.c:1.16 src/sys/dev/isapnp/aha_isapnp.c:1.17
--- src/sys/dev/isapnp/aha_isapnp.c:1.16 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/aha_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isapnp.c,v 1.16 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: aha_isapnp.c,v 1.17 2009/05/12 10:16:35 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.16 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.17 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,15 +53,14 @@
#include <dev/ic/ahareg.h>
#include <dev/ic/ahavar.h>
-int aha_isapnp_probe(struct device *, cfdata_t, void *);
-void aha_isapnp_attach(struct device *, struct device *, void *);
+int aha_isapnp_probe(device_t, cfdata_t, void *);
+void aha_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(aha_isapnp, sizeof(struct aha_softc),
aha_isapnp_probe, aha_isapnp_attach, NULL, NULL);
int
-aha_isapnp_probe(struct device *parent, cfdata_t match,
- void *aux)
+aha_isapnp_probe(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -72,8 +71,7 @@
}
void
-aha_isapnp_attach(struct device *parent, struct device *self,
- void *aux)
+aha_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct aha_softc *sc = device_private(self);
struct aha_probe_data apd;
Index: src/sys/dev/isapnp/aic_isapnp.c
diff -u src/sys/dev/isapnp/aic_isapnp.c:1.18 src/sys/dev/isapnp/aic_isapnp.c:1.19
--- src/sys/dev/isapnp/aic_isapnp.c:1.18 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/aic_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isapnp.c,v 1.18 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: aic_isapnp.c,v 1.19 2009/05/12 10:16:35 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.18 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.19 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,15 +57,14 @@
void *sc_ih; /* interrupt handler */
};
-int aic_isapnp_match(struct device *, cfdata_t, void *);
-void aic_isapnp_attach(struct device *, struct device *, void *);
+int aic_isapnp_match(device_t, cfdata_t, void *);
+void aic_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(aic_isapnp, sizeof(struct aic_isapnp_softc),
aic_isapnp_match, aic_isapnp_attach, NULL, NULL);
int
-aic_isapnp_match(struct device *parent, cfdata_t match,
- void *aux)
+aic_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -76,8 +75,7 @@
}
void
-aic_isapnp_attach(struct device *parent, struct device *self,
- void *aux)
+aic_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct aic_isapnp_softc *isc = device_private(self);
struct aic_softc *sc = &isc->sc_aic;
Index: src/sys/dev/isapnp/gus_isapnp.c
diff -u src/sys/dev/isapnp/gus_isapnp.c:1.34 src/sys/dev/isapnp/gus_isapnp.c:1.35
--- src/sys/dev/isapnp/gus_isapnp.c:1.34 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/gus_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.34 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.35 2009/05/12 10:16:35 cegger Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.34 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.35 2009/05/12 10:16:35 cegger Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -66,8 +66,8 @@
#include <dev/ic/interwavereg.h>
-int gus_isapnp_match(struct device *, cfdata_t, void *);
-void gus_isapnp_attach(struct device *, struct device *, void *);
+int gus_isapnp_match(device_t, cfdata_t, void *);
+void gus_isapnp_attach(device_t, device_t, void *);
static int gus_isapnp_open(void *, int);
static const struct audio_hw_if guspnp_hw_if = {
@@ -119,8 +119,7 @@
static int gus_0 = 1; /* XXX what's this */
int
-gus_isapnp_match(struct device *parent, cfdata_t match,
- void *aux)
+gus_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -135,8 +134,7 @@
* pseudo-device driver.
*/
void
-gus_isapnp_attach(struct device *parent, struct device *self,
- void *aux)
+gus_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct iw_softc *sc;
struct isapnp_attach_args *ipa;
Index: src/sys/dev/isapnp/i82365_isapnp.c
diff -u src/sys/dev/isapnp/i82365_isapnp.c:1.27 src/sys/dev/isapnp/i82365_isapnp.c:1.28
--- src/sys/dev/isapnp/i82365_isapnp.c:1.27 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/i82365_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isapnp.c,v 1.27 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: i82365_isapnp.c,v 1.28 2009/05/12 10:16:35 cegger Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.27 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.28 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,8 +65,8 @@
#define DPRINTF(arg)
#endif
-int pcic_isapnp_match(struct device *, cfdata_t, void *);
-void pcic_isapnp_attach(struct device *, struct device *, void *);
+int pcic_isapnp_match(device_t, cfdata_t, void *);
+void pcic_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(pcic_isapnp, sizeof(struct pcic_isa_softc),
pcic_isapnp_match, pcic_isapnp_attach, NULL, NULL);
@@ -92,8 +92,7 @@
};
int
-pcic_isapnp_match(struct device *parent, cfdata_t match,
- void *aux)
+pcic_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -104,8 +103,7 @@
}
void
-pcic_isapnp_attach(struct device *parent, struct device *self,
- void *aux)
+pcic_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct pcic_softc *sc = device_private(self);
struct pcic_isa_softc *isc = device_private(self);
Index: src/sys/dev/isapnp/if_an_isapnp.c
diff -u src/sys/dev/isapnp/if_an_isapnp.c:1.21 src/sys/dev/isapnp/if_an_isapnp.c:1.22
--- src/sys/dev/isapnp/if_an_isapnp.c:1.21 Fri Jul 4 04:53:41 2008
+++ src/sys/dev/isapnp/if_an_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_isapnp.c,v 1.21 2008/07/04 04:53:41 cegger Exp $ */
+/* $NetBSD: if_an_isapnp.c,v 1.22 2009/05/12 10:16:35 cegger Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.21 2008/07/04 04:53:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.22 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,8 +83,7 @@
an_isapnp_match, an_isapnp_attach, NULL, NULL);
int
-an_isapnp_match(device_t parent, cfdata_t match,
- void *aux)
+an_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/if_cs_isapnp.c
diff -u src/sys/dev/isapnp/if_cs_isapnp.c:1.14 src/sys/dev/isapnp/if_cs_isapnp.c:1.15
--- src/sys/dev/isapnp/if_cs_isapnp.c:1.14 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/if_cs_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isapnp.c,v 1.14 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: if_cs_isapnp.c,v 1.15 2009/05/12 10:16:35 cegger Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.14 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.15 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,14 +57,14 @@
#define DEVNAME(sc) device_xname(&((sc)->sc_dev))
-int cs_isapnp_match(struct device *, cfdata_t, void *);
-void cs_isapnp_attach(struct device *, struct device *, void *);
+int cs_isapnp_match(device_t, cfdata_t, void *);
+void cs_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(cs_isapnp, sizeof(struct cs_softc),
cs_isapnp_match, cs_isapnp_attach, NULL, NULL);
int
-cs_isapnp_match(struct device *parent, cfdata_t match, void *aux)
+cs_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -75,7 +75,7 @@
}
void
-cs_isapnp_attach(struct device *parent, struct device *self, void *aux)
+cs_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct cs_softc *sc = device_private(self);
struct isapnp_attach_args *ipa = aux;
Index: src/sys/dev/isapnp/if_tr_isapnp.c
diff -u src/sys/dev/isapnp/if_tr_isapnp.c:1.19 src/sys/dev/isapnp/if_tr_isapnp.c:1.20
--- src/sys/dev/isapnp/if_tr_isapnp.c:1.19 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/if_tr_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isapnp.c,v 1.19 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: if_tr_isapnp.c,v 1.20 2009/05/12 10:16:35 cegger Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.19 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.20 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,15 +61,14 @@
#include <dev/isapnp/isapnpvar.h>
#include <dev/isapnp/isapnpdevs.h>
-int tr_isapnp_match(struct device *, cfdata_t, void *);
-void tr_isapnp_attach(struct device *, struct device *, void *);
+int tr_isapnp_match(device_t, cfdata_t, void *);
+void tr_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(tr_isapnp, sizeof(struct tr_softc),
tr_isapnp_match, tr_isapnp_attach, NULL, NULL);
int
-tr_isapnp_match(struct device *parent, cfdata_t match,
- void *aux)
+tr_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -81,8 +80,7 @@
void
-tr_isapnp_attach(struct device *parent, struct device *self,
- void *aux)
+tr_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct tr_softc *sc = device_private(self);
struct isapnp_attach_args *ipa = aux;
Index: src/sys/dev/isapnp/isic_isapnp.c
diff -u src/sys/dev/isapnp/isic_isapnp.c:1.30 src/sys/dev/isapnp/isic_isapnp.c:1.31
--- src/sys/dev/isapnp/isic_isapnp.c:1.30 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/isic_isapnp.c Tue May 12 10:16:35 2009
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.30 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.31 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -73,8 +73,8 @@
extern const struct isdn_layer1_isdnif_driver isic_std_driver;
-static int isic_isapnp_probe(struct device *, cfdata_t, void *);
-static void isic_isapnp_attach(struct device *, struct device *, void *);
+static int isic_isapnp_probe(device_t, cfdata_t, void *);
+static void isic_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(isic_isapnp, sizeof(struct isic_softc),
isic_isapnp_probe, isic_isapnp_attach, NULL, NULL);
@@ -154,7 +154,7 @@
* Probe card
*/
static int
-isic_isapnp_probe(struct device *parent,
+isic_isapnp_probe(device_t parent,
cfdata_t cf, void *aux)
{
struct isapnp_attach_args *ipa = aux;
@@ -185,8 +185,8 @@
#endif
static void
-isic_isapnp_attach(struct device *parent,
- struct device *self, void *aux)
+isic_isapnp_attach(device_t parent,
+ device_t self, void *aux)
{
static const char *ISACversion[] = {
"2085 Version A1/A2 or 2086/2186 Version 1.1",
Index: src/sys/dev/isapnp/isic_isapnp_dynalink.c
diff -u src/sys/dev/isapnp/isic_isapnp_dynalink.c:1.12 src/sys/dev/isapnp/isic_isapnp_dynalink.c:1.13
--- src/sys/dev/isapnp/isic_isapnp_dynalink.c:1.12 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/isic_isapnp_dynalink.c Tue May 12 10:16:35 2009
@@ -33,7 +33,7 @@
* isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
* ==================================================
*
- * $Id: isic_isapnp_dynalink.c,v 1.12 2009/05/12 10:07:55 cegger Exp $
+ * $Id: isic_isapnp_dynalink.c,v 1.13 2009/05/12 10:16:35 cegger Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.12 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.13 2009/05/12 10:16:35 cegger Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_DYNALINK
@@ -351,7 +351,7 @@
}
int
-isapnp_match_dynalink(struct device *parent, cfdata_t cf,
+isapnp_match_dynalink(device_t parent, cfdata_t cf,
struct isa_attach_args *ia)
{
struct isic_softc dummysc, *sc = &dummysc;
@@ -390,7 +390,7 @@
}
int
-isic_attach_Dyn(struct device *parent, struct device *self,
+isic_attach_Dyn(device_t parent, device_t self,
struct isa_attach_args *ia)
{
struct isic_softc *sc = (struct isic_softc *)self;
Index: src/sys/dev/isapnp/wss_isapnp.c
diff -u src/sys/dev/isapnp/wss_isapnp.c:1.24 src/sys/dev/isapnp/wss_isapnp.c:1.25
--- src/sys/dev/isapnp/wss_isapnp.c:1.24 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/wss_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isapnp.c,v 1.24 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: wss_isapnp.c,v 1.25 2009/05/12 10:16:35 cegger Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.24 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.25 2009/05/12 10:16:35 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,8 @@
#include <dev/isa/wssvar.h>
#include <dev/isa/sbreg.h>
-int wss_isapnp_match(struct device *, cfdata_t, void *);
-void wss_isapnp_attach(struct device *, struct device *, void *);
+int wss_isapnp_match(device_t, cfdata_t, void *);
+void wss_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(wss_isapnp, sizeof(struct wss_softc),
wss_isapnp_match, wss_isapnp_attach, NULL, NULL);
@@ -69,8 +69,7 @@
* Probe for the WSS hardware.
*/
int
-wss_isapnp_match(struct device *parent, cfdata_t match,
- void *aux)
+wss_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -85,8 +84,7 @@
* pseudo-device driver.
*/
void
-wss_isapnp_attach(struct device *parent, struct device *self,
- void *aux)
+wss_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct wss_softc *sc;
struct ad1848_softc *ac;
Index: src/sys/dev/isapnp/ym_isapnp.c
diff -u src/sys/dev/isapnp/ym_isapnp.c:1.23 src/sys/dev/isapnp/ym_isapnp.c:1.24
--- src/sys/dev/isapnp/ym_isapnp.c:1.23 Tue May 12 10:07:55 2009
+++ src/sys/dev/isapnp/ym_isapnp.c Tue May 12 10:16:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_isapnp.c,v 1.23 2009/05/12 10:07:55 cegger Exp $ */
+/* $NetBSD: ym_isapnp.c,v 1.24 2009/05/12 10:16:35 cegger Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.23 2009/05/12 10:07:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.24 2009/05/12 10:16:35 cegger Exp $");
#include "mpu_ym.h"
@@ -71,8 +71,8 @@
#include <dev/isa/wssreg.h>
#include <dev/isa/ymvar.h>
-int ym_isapnp_match(struct device *, cfdata_t, void *);
-void ym_isapnp_attach(struct device *, struct device *, void *);
+int ym_isapnp_match(device_t, cfdata_t, void *);
+void ym_isapnp_attach(device_t, device_t, void *);
CFATTACH_DECL(ym_isapnp, sizeof(struct ym_softc),
ym_isapnp_match, ym_isapnp_attach, NULL, NULL);
@@ -85,8 +85,7 @@
* Probe for the Yamaha hardware.
*/
int
-ym_isapnp_match(struct device *parent, cfdata_t match,
- void *aux)
+ym_isapnp_match(device_t parent, cfdata_t match, void *aux)
{
int pri, variant;
@@ -101,7 +100,7 @@
* pseudo-device driver.
*/
void
-ym_isapnp_attach(struct device *parent, struct device *self, void *aux)
+ym_isapnp_attach(device_t parent, device_t self, void *aux)
{
struct ym_softc *sc;
struct ad1848_softc *ac;
