diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 2b01ccef0fde..9133a485e758 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.146 1998/10/22 05:58:38 bde Exp $
+ *	$Id: if_ed.c,v 1.147 1998/12/13 23:00:48 eivind Exp $
  */
 
 /*
@@ -194,6 +194,7 @@ static u_long	ds_crc		__P((u_char *ep));
 #endif
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 
@@ -204,17 +205,7 @@ static int	edinit		__P((struct pccard_devinfo *));
 static void	edunload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device ed_info = {
-	"ed",
-	edinit,
-	edunload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&net_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, ed_info);
+PCCARD_MODULE(ed, edinit, edunload, card_intr, 0, net_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 8ca027224643..e325ada5b316 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.76 1998/06/21 18:02:38 bde Exp $
+ *  $Id: if_ep.c,v 1.77 1998/10/22 05:58:39 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -149,6 +149,7 @@ struct isa_driver epdriver = {
 
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 
@@ -160,16 +161,7 @@ static int ep_pccard_attach  __P((struct pccard_devinfo *));
 static void ep_unload __P((struct pccard_devinfo *));
 static int card_intr __P((struct pccard_devinfo *));
 
-static struct pccard_device ep_info = {
-    "ep",
-    ep_pccard_init,
-    ep_unload,
-    card_intr,
-    0,                      /* Attributes - presently unused */
-    &net_imask
-};
-
-DATA_SET(pccarddrv_set, ep_info);
+PCCARD_MODULE(ep, ep_pccard_init, ep_unload, card_intr, 0, net_imask);
 
 /*
  * Initialize the device - called from Slot manager.
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index c8e35a5ae07d..9972a38f5c35 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.130 1998/12/27 13:40:56 phk Exp $
+ *	$Id: fd.c,v 1.131 1999/01/15 09:15:27 bde Exp $
  *
  */
 
@@ -275,6 +275,7 @@ static int volatile fd_debug = 0;
 #ifdef FDC_YE
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/driver.h>
 #include <pccard/slot.h>
@@ -286,16 +287,7 @@ static int yeinit(struct pccard_devinfo *);		/* init device */
 static void yeunload(struct pccard_devinfo *); 		/* Disable driver */
 static int yeintr(struct pccard_devinfo *); 		/* Interrupt handler */
 
-static struct pccard_device ye_info = {
-	"fdc",
-	yeinit,
-	yeunload,
-	yeintr,
-	0,			/* Attributes - presently unused */
-	&bio_imask		/* Interrupt mask for device */
-};
-
-DATA_SET(pccarddrv_set, ye_info);
+PCCARD_MODULE(fdc, yeinit, yeunload, yeintr, 0, bio_imask);
 
 /*
  * this is the secret PIO data port (offset from base)
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 1cd526898566..94e4bef13094 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.46 1998/12/31 03:21:14 kato Exp $
+ * $Id: if_fe.c,v 1.47 1999/01/12 00:36:29 eivind Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
@@ -127,6 +127,7 @@
 #if NCARD > 0
 #include <sys/kernel.h>
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -396,16 +397,7 @@ static int	feinit		(struct pccard_devinfo *);
 static void	feunload	(struct pccard_devinfo *);
 static int	fe_card_intr	(struct pccard_devinfo *);
 
-static struct pccard_device fe_info = {
-	"fe",
-	feinit,
-	feunload,
-	fe_card_intr,
-	0,			/* Attributes - presently unused */
-	&net_imask		/* XXX - Should this also include tty_imask? */
-};
-
-DATA_SET(pccarddrv_set, fe_info);
+PCCARD_MODULE(fe, feinit, feunload, fe_card_intr, 0, net_imask);
 
 /*
  *      Initialize the device - called from Slot manager.
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index db05e1863199..6a2084e6dc81 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.218 1998/11/15 18:25:17 dfr Exp $
+ *	$Id: sio.c,v 1.219 1998/12/13 23:12:54 steve Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.215
  */
@@ -92,6 +92,7 @@
 
 #include "card.h"
 #if NCARD > 0
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -494,17 +495,7 @@ static int	sioinit		__P((struct pccard_devinfo *));
 static void	siounload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device sio_info = {
-	driver_name,
-	sioinit,
-	siounload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&tty_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, sio_info);
+PCCARD_MODULE(sio, sioinit, siounload, card_intr, 0, tty_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index 7b0e583d0905..e0f946d3d993 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.41 1998/06/21 14:53:09 bde Exp $
+ * $Id: aic6360.c,v 1.42 1998/10/22 05:58:38 bde Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -715,6 +715,7 @@ static struct scsi_device aic_dev = {
 #include "card.h"
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 
@@ -722,16 +723,7 @@ static int	aic_card_intr	__P((struct pccard_devinfo *));
 static int	aicinit		__P((struct pccard_devinfo *));
 static void	aicunload	__P((struct pccard_devinfo *));
 
-static struct pccard_device aic_info = {
-	"aic",
-	aicinit,
-	aicunload,
-	aic_card_intr,
-	0,			/* Attributes - presently unused */
-	&bio_imask
-};
-
-DATA_SET(pccarddrv_set, aic_info);
+PCCARD_MODULE(aic, aicinit, aicunload, aic_card_intr, 0, bio_imask);
 
 /*
  * Initialize the device - called from Slot manager.
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index c8e35a5ae07d..9972a38f5c35 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.130 1998/12/27 13:40:56 phk Exp $
+ *	$Id: fd.c,v 1.131 1999/01/15 09:15:27 bde Exp $
  *
  */
 
@@ -275,6 +275,7 @@ static int volatile fd_debug = 0;
 #ifdef FDC_YE
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/driver.h>
 #include <pccard/slot.h>
@@ -286,16 +287,7 @@ static int yeinit(struct pccard_devinfo *);		/* init device */
 static void yeunload(struct pccard_devinfo *); 		/* Disable driver */
 static int yeintr(struct pccard_devinfo *); 		/* Interrupt handler */
 
-static struct pccard_device ye_info = {
-	"fdc",
-	yeinit,
-	yeunload,
-	yeintr,
-	0,			/* Attributes - presently unused */
-	&bio_imask		/* Interrupt mask for device */
-};
-
-DATA_SET(pccarddrv_set, ye_info);
+PCCARD_MODULE(fdc, yeinit, yeunload, yeintr, 0, bio_imask);
 
 /*
  * this is the secret PIO data port (offset from base)
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 2b01ccef0fde..9133a485e758 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.146 1998/10/22 05:58:38 bde Exp $
+ *	$Id: if_ed.c,v 1.147 1998/12/13 23:00:48 eivind Exp $
  */
 
 /*
@@ -194,6 +194,7 @@ static u_long	ds_crc		__P((u_char *ep));
 #endif
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 
@@ -204,17 +205,7 @@ static int	edinit		__P((struct pccard_devinfo *));
 static void	edunload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device ed_info = {
-	"ed",
-	edinit,
-	edunload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&net_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, ed_info);
+PCCARD_MODULE(ed, edinit, edunload, card_intr, 0, net_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 8ca027224643..e325ada5b316 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.76 1998/06/21 18:02:38 bde Exp $
+ *  $Id: if_ep.c,v 1.77 1998/10/22 05:58:39 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -149,6 +149,7 @@ struct isa_driver epdriver = {
 
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 
@@ -160,16 +161,7 @@ static int ep_pccard_attach  __P((struct pccard_devinfo *));
 static void ep_unload __P((struct pccard_devinfo *));
 static int card_intr __P((struct pccard_devinfo *));
 
-static struct pccard_device ep_info = {
-    "ep",
-    ep_pccard_init,
-    ep_unload,
-    card_intr,
-    0,                      /* Attributes - presently unused */
-    &net_imask
-};
-
-DATA_SET(pccarddrv_set, ep_info);
+PCCARD_MODULE(ep, ep_pccard_init, ep_unload, card_intr, 0, net_imask);
 
 /*
  * Initialize the device - called from Slot manager.
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 1cd526898566..94e4bef13094 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.46 1998/12/31 03:21:14 kato Exp $
+ * $Id: if_fe.c,v 1.47 1999/01/12 00:36:29 eivind Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
@@ -127,6 +127,7 @@
 #if NCARD > 0
 #include <sys/kernel.h>
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -396,16 +397,7 @@ static int	feinit		(struct pccard_devinfo *);
 static void	feunload	(struct pccard_devinfo *);
 static int	fe_card_intr	(struct pccard_devinfo *);
 
-static struct pccard_device fe_info = {
-	"fe",
-	feinit,
-	feunload,
-	fe_card_intr,
-	0,			/* Attributes - presently unused */
-	&net_imask		/* XXX - Should this also include tty_imask? */
-};
-
-DATA_SET(pccarddrv_set, fe_info);
+PCCARD_MODULE(fe, feinit, feunload, fe_card_intr, 0, net_imask);
 
 /*
  *      Initialize the device - called from Slot manager.
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index f0511eec6554..7660965a930a 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.222 1999/01/08 19:17:49 bde Exp $
+ *	$Id: sio.c,v 1.223 1999/01/12 01:04:37 eivind Exp $
  */
 
 #include "opt_comconsole.h"
@@ -86,6 +86,7 @@
 
 #include "card.h"
 #if NCARD > 0
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -465,17 +466,7 @@ static int	sioinit		__P((struct pccard_devinfo *));
 static void	siounload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device sio_info = {
-	driver_name,
-	sioinit,
-	siounload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&tty_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, sio_info);
+PCCARD_MODULE(sio, sioinit, siounload, card_intr, 0, tty_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/i4b/layer1/i4b_isic_pcmcia.c b/sys/i4b/layer1/i4b_isic_pcmcia.c
index 5dc9754e3cae..e20964cc92fc 100644
--- a/sys/i4b/layer1/i4b_isic_pcmcia.c
+++ b/sys/i4b/layer1/i4b_isic_pcmcia.c
@@ -35,7 +35,7 @@
  *	i4b_isic_pcmcia.c - i4b FreeBSD PCMCIA support
  *	----------------------------------------------
  *
- *	$Id: i4b_isic_pcmcia.c,v 1.1 1998/12/27 21:46:46 phk Exp $
+ *	$Id: i4b_isic_pcmcia.c,v 1.2 1999/01/12 11:04:59 eivind Exp $
  *
  *      last edit-date: [Mon Dec 14 17:30:09 1998]
  *
@@ -63,6 +63,7 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
+#include <sys/module.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <machine/clock.h>
@@ -94,16 +95,7 @@ static int  isic_pccard_init    __P((struct pccard_devinfo *));
 static void isic_unload         __P((struct pccard_devinfo *));
 static int  isic_card_intr      __P((struct pccard_devinfo *));
     
-static struct pccard_device isic_info = {
-    "isic",
-    isic_pccard_init,
-    isic_unload,
-    isic_card_intr,
-    0,                      /* Attributes - presently unused */
-    &net_imask
-};  
-
-DATA_SET(pccarddrv_set, isic_info);
+PCCARD_MODULE(isic, isic_pccard_init, isic_unload, isic_card_intr, 0,net_imask);
 
 /*
  * Initialize the device - called from Slot manager.
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index c8e35a5ae07d..9972a38f5c35 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.130 1998/12/27 13:40:56 phk Exp $
+ *	$Id: fd.c,v 1.131 1999/01/15 09:15:27 bde Exp $
  *
  */
 
@@ -275,6 +275,7 @@ static int volatile fd_debug = 0;
 #ifdef FDC_YE
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/driver.h>
 #include <pccard/slot.h>
@@ -286,16 +287,7 @@ static int yeinit(struct pccard_devinfo *);		/* init device */
 static void yeunload(struct pccard_devinfo *); 		/* Disable driver */
 static int yeintr(struct pccard_devinfo *); 		/* Interrupt handler */
 
-static struct pccard_device ye_info = {
-	"fdc",
-	yeinit,
-	yeunload,
-	yeintr,
-	0,			/* Attributes - presently unused */
-	&bio_imask		/* Interrupt mask for device */
-};
-
-DATA_SET(pccarddrv_set, ye_info);
+PCCARD_MODULE(fdc, yeinit, yeunload, yeintr, 0, bio_imask);
 
 /*
  * this is the secret PIO data port (offset from base)
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index db05e1863199..6a2084e6dc81 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.218 1998/11/15 18:25:17 dfr Exp $
+ *	$Id: sio.c,v 1.219 1998/12/13 23:12:54 steve Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.215
  */
@@ -92,6 +92,7 @@
 
 #include "card.h"
 #if NCARD > 0
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -494,17 +495,7 @@ static int	sioinit		__P((struct pccard_devinfo *));
 static void	siounload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device sio_info = {
-	driver_name,
-	sioinit,
-	siounload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&tty_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, sio_info);
+PCCARD_MODULE(sio, sioinit, siounload, card_intr, 0, tty_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 0b288c308c40..90f230f5e871 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.48 1998/12/30 08:06:41 kato Exp $
+ *	$Id: fd.c,v 1.49 1999/01/16 11:40:02 kato Exp $
  *
  */
 
@@ -370,6 +370,7 @@ static int volatile fd_debug = 0;
 #ifdef FDC_YE
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/driver.h>
 #include <pccard/slot.h>
@@ -381,16 +382,7 @@ static int yeinit(struct pccard_devinfo *);		/* init device */
 static void yeunload(struct pccard_devinfo *); 		/* Disable driver */
 static int yeintr(struct pccard_devinfo *); 		/* Interrupt handler */
 
-static struct pccard_device ye_info = {
-	"fdc",
-	yeinit,
-	yeunload,
-	yeintr,
-	0,			/* Attributes - presently unused */
-	&bio_imask		/* Interrupt mask for device */
-};
-
-DATA_SET(pccarddrv_set, ye_info);
+PCCARD_MODULE(fdc, yeinit, yeunload, yeintr, 0, bio_imask);
 
 /*
  * this is the secret PIO data port (offset from base)
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 104bb65115c0..97ac3ad3b384 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.74 1999/01/08 16:09:22 kato Exp $
+ *	$Id: sio.c,v 1.75 1999/01/16 11:42:16 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -180,6 +180,7 @@
 
 #include "card.h"
 #if NCARD > 0
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -864,17 +865,7 @@ static int	sioinit		__P((struct pccard_devinfo *));
 static void	siounload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device sio_info = {
-	driver_name,
-	sioinit,
-	siounload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&tty_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, sio_info);
+PCCARD_MODULE(sio, sioinit, siounload, card_intr, 0, tty_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 0b288c308c40..90f230f5e871 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.48 1998/12/30 08:06:41 kato Exp $
+ *	$Id: fd.c,v 1.49 1999/01/16 11:40:02 kato Exp $
  *
  */
 
@@ -370,6 +370,7 @@ static int volatile fd_debug = 0;
 #ifdef FDC_YE
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/driver.h>
 #include <pccard/slot.h>
@@ -381,16 +382,7 @@ static int yeinit(struct pccard_devinfo *);		/* init device */
 static void yeunload(struct pccard_devinfo *); 		/* Disable driver */
 static int yeintr(struct pccard_devinfo *); 		/* Interrupt handler */
 
-static struct pccard_device ye_info = {
-	"fdc",
-	yeinit,
-	yeunload,
-	yeintr,
-	0,			/* Attributes - presently unused */
-	&bio_imask		/* Interrupt mask for device */
-};
-
-DATA_SET(pccarddrv_set, ye_info);
+PCCARD_MODULE(fdc, yeinit, yeunload, yeintr, 0, bio_imask);
 
 /*
  * this is the secret PIO data port (offset from base)
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index e5f7e4dea8fc..b34898e3e80e 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.56 1998/12/14 08:58:12 kato Exp $
+ *	$Id: if_ed.c,v 1.57 1998/12/31 03:23:39 kato Exp $
  */
 
 /*
@@ -241,6 +241,7 @@ static u_long	ds_crc		__P((u_char *ep));
 #endif
 #if NCARD > 0
 #include <sys/select.h>
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 
@@ -251,17 +252,7 @@ static int	edinit		__P((struct pccard_devinfo *));
 static void	edunload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device ed_info = {
-	"ed",
-	edinit,
-	edunload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&net_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, ed_info);
+PCCARD_MODULE(ed, edinit, edunload, card_intr, 0, net_imask);
 
 /*
  *	Initialize the device - called from Slot manager.
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 104bb65115c0..97ac3ad3b384 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.74 1999/01/08 16:09:22 kato Exp $
+ *	$Id: sio.c,v 1.75 1999/01/16 11:42:16 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -180,6 +180,7 @@
 
 #include "card.h"
 #if NCARD > 0
+#include <sys/module.h>
 #include <pccard/cardinfo.h>
 #include <pccard/slot.h>
 #endif
@@ -864,17 +865,7 @@ static int	sioinit		__P((struct pccard_devinfo *));
 static void	siounload	__P((struct pccard_devinfo *));
 static int	card_intr	__P((struct pccard_devinfo *));
 
-static struct pccard_device sio_info = {
-	driver_name,
-	sioinit,
-	siounload,
-	card_intr,
-	0,			/* Attributes - presently unused */
-	&tty_imask		/* Interrupt mask for device */
-				/* XXX - Should this also include net_imask? */
-};
-
-DATA_SET(pccarddrv_set, sio_info);
+PCCARD_MODULE(sio, sioinit, siounload, card_intr, 0, tty_imask);
 
 /*
  *	Initialize the device - called from Slot manager.