From 32832096b2b814ac219c4c4dc7fece32162b9ca4 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 20 Nov 2003 22:07:34 +0000
Subject: [PATCH] Add a DECLARE_DUMMY_MODULE() so we can get linker_set module
 names for modules that normally use DRIVER_MODULE().  The problem is that
 DRIVER_MODULE() will define names that do not match the module name, so a
 DECLARE_DUMMY_MODULE() is needed for the kernel to be able to figure out that
 a module has been statitically compiled in.

---
 sys/dev/crypto/hifn/hifn7751.c          |  3 +-
 sys/dev/crypto/ubsec/ubsec.c            |  3 +-
 sys/dev/disk/sbp/sbp.c                  |  4 ++-
 sys/dev/netif/an/if_an.c                |  4 ++-
 sys/dev/netif/ar/if_ar.c                |  3 +-
 sys/dev/netif/aue/if_aue.c              |  3 +-
 sys/dev/netif/awi/awi.c                 |  4 ++-
 sys/dev/netif/awi/if_awi_pccard.c       |  4 +--
 sys/dev/netif/bge/if_bge.c              |  3 +-
 sys/dev/netif/cm/smc90cx6.c             |  3 +-
 sys/dev/netif/cs/if_cs.c                |  4 ++-
 sys/dev/netif/cue/if_cue.c              |  3 +-
 sys/dev/netif/cx/if_cx.c                |  4 ++-
 sys/dev/netif/dc/if_dc.c                |  3 +-
 sys/dev/netif/de/if_de.c                |  5 ++-
 sys/dev/netif/ed/if_ed.c                |  4 ++-
 sys/dev/netif/ed/if_ed_cbus.c           |  4 +--
 sys/dev/netif/ed/if_ed_isa.c            |  4 +--
 sys/dev/netif/ed/if_ed_pccard.c         |  4 +--
 sys/dev/netif/ed/if_ed_pci.c            |  4 +--
 sys/dev/netif/el/if_el.c                |  6 +++-
 sys/dev/netif/em/if_em.c                |  4 ++-
 sys/dev/netif/en_pci/if_en_pci.c        |  4 +--
 sys/dev/netif/ep/if_ep.c                |  4 ++-
 sys/dev/netif/ep/if_ep_eisa.c           |  4 +--
 sys/dev/netif/ep/if_ep_isa.c            |  4 +--
 sys/dev/netif/ep/if_ep_mca.c            |  4 +--
 sys/dev/netif/ep/if_ep_pccard.c         |  4 +--
 sys/dev/netif/ex/if_ex.c                |  4 ++-
 sys/dev/netif/ex/if_ex_isa.c            |  4 +--
 sys/dev/netif/ex/if_ex_pccard.c         |  4 +--
 sys/dev/netif/fe/if_fe.c                |  6 +++-
 sys/dev/netif/fe/if_fe_cbus.c           |  4 +--
 sys/dev/netif/fe/if_fe_isa.c            |  4 +--
 sys/dev/netif/fe/if_fe_pccard.c         |  4 +--
 sys/dev/netif/fea/if_fea.c              |  6 ++--
 sys/dev/netif/fpa/if_fpa.c              |  4 +--
 sys/dev/netif/fwe/if_fwe.c              |  9 ++---
 sys/dev/netif/fxp/if_fxp.c              |  5 +--
 sys/dev/netif/gx/if_gx.c                |  5 +--
 sys/dev/netif/ic/if_ic.c                |  6 ++--
 sys/dev/netif/ie/if_ie.c                |  4 ++-
 sys/dev/netif/kue/if_kue.c              |  3 +-
 sys/dev/netif/le/if_le.c                |  6 +++-
 sys/dev/netif/lge/if_lge.c              |  3 +-
 sys/dev/netif/lnc/if_lnc.c              |  6 +++-
 sys/dev/netif/lnc_p/if_lnc_p.c          |  4 +--
 sys/dev/netif/mn/if_mn.c                |  6 ++--
 sys/dev/netif/my/if_my.c                |  3 +-
 sys/dev/netif/nge/if_nge.c              |  5 +--
 sys/dev/netif/pcn/if_pcn.c              |  3 +-
 sys/dev/netif/plip/if_plip.c            |  6 ++--
 sys/dev/netif/ray/if_ray.c              |  5 +--
 sys/dev/netif/rdp/if_rdp.c              |  6 +++-
 sys/dev/netif/rl/if_rl.c                |  3 +-
 sys/dev/netif/sbni/if_sbni.c            |  4 ++-
 sys/dev/netif/sbsh/if_sbsh.c            |  3 +-
 sys/dev/netif/sf/if_sf.c                |  3 +-
 sys/dev/netif/sis/if_sis.c              |  3 +-
 sys/dev/netif/sk/if_sk.c                |  5 +--
 sys/dev/netif/sn/if_sn.c                |  4 ++-
 sys/dev/netif/snc/if_snc.c              |  5 ++-
 sys/dev/netif/sr/if_sr.c                |  3 +-
 sys/dev/netif/ste/if_ste.c              |  3 +-
 sys/dev/netif/ti/if_ti.c                |  3 +-
 sys/dev/netif/tl/if_tl.c                |  3 +-
 sys/dev/netif/tx/if_tx.c                |  6 ++--
 sys/dev/netif/txp/if_txp.c              |  3 +-
 sys/dev/netif/vr/if_vr.c                |  3 +-
 sys/dev/netif/vx/if_vx.c                |  6 +++-
 sys/dev/netif/vx/if_vx_eisa.c           |  4 +--
 sys/dev/netif/vx/if_vx_pci.c            |  4 +--
 sys/dev/netif/wb/if_wb.c                |  3 +-
 sys/dev/netif/wi/if_wi.c                |  4 ++-
 sys/dev/netif/wl/if_wl.c                |  4 ++-
 sys/dev/netif/wx/if_wx.c                |  6 ++--
 sys/dev/netif/wx/if_wxvar.h             |  3 +-
 sys/dev/netif/xe/if_xe.c                |  6 ++--
 sys/dev/netif/xl/if_xl.c                |  6 ++--
 sys/dev/powermng/i386/viapm/viapm.c     |  3 +-
 sys/dev/powermng/pc98/canbepm/canbepm.c |  4 ++-
 sys/dev/raid/aac/aac.c                  |  4 ++-
 sys/dev/raid/amr/amr.c                  |  4 ++-
 sys/dev/raid/asr/asr.c                  |  3 +-
 sys/dev/raid/ciss/ciss.c                |  4 ++-
 sys/dev/raid/ida/ida.c                  |  4 ++-
 sys/kern/kern_linker.c                  | 19 ++++++++---
 sys/kern/link_elf.c                     |  6 ++--
 sys/kern/subr_module.c                  | 45 +++++++++++++++----------
 sys/sys/linker.h                        |  4 ++-
 sys/sys/module.h                        | 11 +++++-
 91 files changed, 294 insertions(+), 149 deletions(-)

diff --git a/sys/dev/crypto/hifn/hifn7751.c b/sys/dev/crypto/hifn/hifn7751.c
index 2e52a6c75e..bd1e624897 100644
--- a/sys/dev/crypto/hifn/hifn7751.c
+++ b/sys/dev/crypto/hifn/hifn7751.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.5.2.5 2003/06/04 17:56:59 sam Exp $ */
-/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.4 2003/08/07 21:16:49 dillon Exp $ */
+/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.5 2003/11/20 22:07:22 dillon Exp $ */
 /*	$OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $	*/
 
 /*
@@ -109,6 +109,7 @@ static driver_t hifn_driver = {
 };
 static devclass_t hifn_devclass;
 
+DECLARE_DUMMY_MODULE(hifn);
 DRIVER_MODULE(hifn, pci, hifn_driver, hifn_devclass, 0, 0);
 MODULE_DEPEND(hifn, crypto, 1, 1, 1);
 #ifdef HIFN_RNDTEST
diff --git a/sys/dev/crypto/ubsec/ubsec.c b/sys/dev/crypto/ubsec/ubsec.c
index b4890f9d5c..0284d46bc8 100644
--- a/sys/dev/crypto/ubsec/ubsec.c
+++ b/sys/dev/crypto/ubsec/ubsec.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.12 2003/06/04 17:56:59 sam Exp $ */
-/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */
+/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.4 2003/11/20 22:07:25 dillon Exp $ */
 /*	$OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $	*/
 
 /*
@@ -126,6 +126,7 @@ static driver_t ubsec_driver = {
 };
 static devclass_t ubsec_devclass;
 
+DECLARE_DUMMY_MODULE(ubsec);
 DRIVER_MODULE(ubsec, pci, ubsec_driver, ubsec_devclass, 0, 0);
 MODULE_DEPEND(ubsec, crypto, 1, 1, 1);
 #ifdef UBSEC_RNDTEST
diff --git a/sys/dev/disk/sbp/sbp.c b/sys/dev/disk/sbp/sbp.c
index 8b56c22392..af5156be18 100644
--- a/sys/dev/disk/sbp/sbp.c
+++ b/sys/dev/disk/sbp/sbp.c
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.5.2.19 2003/05/12 04:16:30 simokawa Exp $
- * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.4 2003/08/27 10:35:17 rob Exp $
+ * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.5 2003/11/20 22:07:25 dillon Exp $
  *
  */
 
@@ -2672,6 +2672,8 @@ static driver_t sbp_driver = {
 	sbp_methods,
 	sizeof(struct sbp_softc),
 };
+
+DECLARE_DUMMY_MODULE(sbp);
 DRIVER_MODULE(sbp, firewire, sbp_driver, sbp_devclass, 0, 0);
 MODULE_VERSION(sbp, 1);
 MODULE_DEPEND(sbp, firewire, 1, 1, 1);
diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c
index 30eecfcbc4..34172ad0f9 100644
--- a/sys/dev/netif/an/if_an.c
+++ b/sys/dev/netif/an/if_an.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.7 2003/08/27 09:38:29 rob Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.8 2003/11/20 22:07:26 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
  */
@@ -203,6 +203,8 @@ static int	an_cache_mode = 0;
 static char an_conf[256];
 static char an_conf_cache[256];
 
+DECLARE_DUMMY_MODULE(if_an);
+
 /* sysctl vars */
 
 SYSCTL_NODE(_hw, OID_AUTO, an, CTLFLAG_RD, 0, "Wireless driver parameters");
diff --git a/sys/dev/netif/ar/if_ar.c b/sys/dev/netif/ar/if_ar.c
index 8a2f7a2bb1..a26d5de078 100644
--- a/sys/dev/netif/ar/if_ar.c
+++ b/sys/dev/netif/ar/if_ar.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.52.2.1 2002/06/17 15:10:57 jhay Exp $
- * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.4 2003/08/16 02:51:58 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.5 2003/11/20 22:07:26 dillon Exp $
  */
 
 /*
@@ -181,6 +181,7 @@ static int irqtable[16] = {
 };
 
 #ifndef NETGRAPH
+DECLARE_DUMMY_MODULE(if_ar);
 MODULE_DEPEND(if_ar, sppp, 1, 1, 1);
 #else
 MODULE_DEPEND(ng_sync_ar, netgraph, 1, 1, 1);
diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c
index 4e27485eec..4df0e9e072 100644
--- a/sys/dev/netif/aue/if_aue.c
+++ b/sys/dev/netif/aue/if_aue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $
- * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.4 2003/08/07 21:16:59 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.5 2003/11/20 22:07:26 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $
  */
@@ -226,6 +226,7 @@ Static driver_t aue_driver = {
 
 Static devclass_t aue_devclass;
 
+DECLARE_DUMMY_MODULE(if_aue);
 DRIVER_MODULE(if_aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
 DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c
index 44398513da..f8cb5dac33 100644
--- a/sys/dev/netif/awi/awi.c
+++ b/sys/dev/netif/awi/awi.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $	*/
 /* $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ */
-/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.7 2003/08/27 09:38:29 rob Exp $ */
+/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.8 2003/11/20 22:07:26 dillon Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -205,6 +205,8 @@ static void awi_intr_unlock (struct awi_softc *sc);
 static int awi_cmd_wait (struct awi_softc *sc);
 static void awi_print_essid (u_int8_t *essid);
 
+DECLARE_DUMMY_MODULE(if_awi);
+
 #ifdef AWI_DEBUG
 static void awi_dump_pkt (struct awi_softc *sc, struct mbuf *m, int rssi);
 int awi_verbose = 0;
diff --git a/sys/dev/netif/awi/if_awi_pccard.c b/sys/dev/netif/awi/if_awi_pccard.c
index 70a9222e44..b4be376f14 100644
--- a/sys/dev/netif/awi/if_awi_pccard.c
+++ b/sys/dev/netif/awi/if_awi_pccard.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.5.2.1 2000/12/07 04:09:39 imp Exp $
- * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.3 2003/08/07 21:17:00 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.4 2003/11/20 22:07:26 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -249,4 +249,4 @@ static driver_t awi_pccard_driver = {
 
 extern devclass_t awi_devclass;
 
-DRIVER_MODULE(awi, pccard, awi_pccard_driver, awi_devclass, 0, 0);
+DRIVER_MODULE(if_awi, pccard, awi_pccard_driver, awi_devclass, 0, 0);
diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index 31803c4292..ffa224cf1a 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.22 2003/05/11 18:00:55 ps Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.8 2003/11/05 05:30:29 drhodus Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.9 2003/11/20 22:07:26 dillon Exp $
  *
  */
 
@@ -251,6 +251,7 @@ static driver_t bge_driver = {
 
 static devclass_t bge_devclass;
 
+DECLARE_DUMMY_MODULE(if_bge);
 DRIVER_MODULE(if_bge, pci, bge_driver, bge_devclass, 0, 0);
 DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/cm/smc90cx6.c b/sys/dev/netif/cm/smc90cx6.c
index dba72ec0ae..2cc2a883f3 100644
--- a/sys/dev/netif/cm/smc90cx6.c
+++ b/sys/dev/netif/cm/smc90cx6.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
 /*	$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.1.2.3 2003/02/05 18:42:14 fjoe Exp $ */
-/*	$DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.4 2003/08/27 09:38:30 rob Exp $ */
+/*	$DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.5 2003/11/20 22:07:26 dillon Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -73,6 +73,7 @@
 #include "smc90cx6reg.h"
 #include "smc90cx6var.h"
 
+DECLARE_DUMMY_MODULE(if_cm);
 MODULE_DEPEND(if_cm, arcnet, 1, 1, 1);
 
 /* these should be elsewhere */
diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index a8da62ca63..506cbc47cf 100644
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -28,7 +28,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $
- * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.3 2003/08/07 21:17:00 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.4 2003/11/20 22:07:26 dillon Exp $
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -101,6 +101,8 @@ static int      cs_duplex_auto(struct cs_softc *);
 
 devclass_t cs_devclass;
 
+DECLARE_DUMMY_MODULE(if_cs);
+
 static int
 get_eeprom_data( struct cs_softc *sc, int off, int len, int *buffer)
 {
diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c
index 7d3008c946..39263e7222 100644
--- a/sys/dev/netif/cue/if_cue.c
+++ b/sys/dev/netif/cue/if_cue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.7.2.6 2002/11/06 14:23:20 joe Exp $
- * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.3 2003/08/07 21:17:00 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.4 2003/11/20 22:07:26 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.7.2.6 2002/11/06 14:23:20 joe Exp $
  */
@@ -142,6 +142,7 @@ Static driver_t cue_driver = {
 
 Static devclass_t cue_devclass;
 
+DECLARE_DUMMY_MODULE(if_cue);
 DRIVER_MODULE(if_cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0);
 
 #define CUE_SETBIT(sc, reg, x)				\
diff --git a/sys/dev/netif/cx/if_cx.c b/sys/dev/netif/cx/if_cx.c
index 6579ca006e..bbbf353e09 100644
--- a/sys/dev/netif/cx/if_cx.c
+++ b/sys/dev/netif/cx/if_cx.c
@@ -17,7 +17,7 @@
  * Version 1.9, Wed Oct  4 18:58:15 MSK 1995
  *
  * $FreeBSD: src/sys/i386/isa/if_cx.c,v 1.32 1999/11/18 08:36:42 peter Exp $
- * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.6 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.7 2003/11/20 22:07:26 dillon Exp $
  *
  */
 #undef DEBUG
@@ -102,6 +102,8 @@ static unsigned short port_valid_values [] = {
 	0x240, 0x260, 0x280, 0x300, 0x320, 0x380, 0x3a0, 0,
 };
 
+DECLARE_DUMMY_MODULE(if_cx);
+
 /*
  * Check that the value is contained in the list of correct values.
  */
diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c
index 5b0c7ea4c9..48f5757105 100644
--- a/sys/dev/netif/dc/if_dc.c
+++ b/sys/dev/netif/dc/if_dc.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
- * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.6 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.7 2003/11/20 22:07:27 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $
  */
@@ -305,6 +305,7 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW,
 	&dc_quick,0,"do not mdevget in dc driver");
 #endif
 
+DECLARE_DUMMY_MODULE(if_dc);
 DRIVER_MODULE(if_dc, pci, dc_driver, dc_devclass, 0, 0);
 DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c
index ac4bbf82c5..2d54be0905 100644
--- a/sys/dev/netif/de/if_de.c
+++ b/sys/dev/netif/de/if_de.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $	*/
 
 /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */
-/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.5 2003/08/07 21:54:29 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.6 2003/11/20 22:07:27 dillon Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5330,4 +5330,7 @@ static driver_t tulip_pci_driver = {
     sizeof(tulip_softc_t),
 };
 static devclass_t tulip_devclass;
+
+DECLARE_DUMMY_MODULE(if_de);
 DRIVER_MODULE(if_de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
+
diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c
index cdd7a4e000..60ef0579a4 100644
--- a/sys/dev/netif/ed/if_ed.c
+++ b/sys/dev/netif/ed/if_ed.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.173.2.13 2001/11/03 00:36:07 luigi Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.5 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.6 2003/11/20 22:07:27 dillon Exp $
  */
 
 /*
@@ -103,6 +103,8 @@ static void	ed_setrcr	(struct ed_softc *);
 
 static u_int32_t ds_crc		(u_char *ep);
 
+DECLARE_DUMMY_MODULE(if_ed);
+
 /*
  * Interrupt conversion table for WD/SMC ASIC/83C584
  */
diff --git a/sys/dev/netif/ed/if_ed_cbus.c b/sys/dev/netif/ed/if_ed_cbus.c
index 3c6b49743c..566edb3e3e 100644
--- a/sys/dev/netif/ed/if_ed_cbus.c
+++ b/sys/dev/netif/ed/if_ed_cbus.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.1.2.1 2000/09/10 08:45:11 nyan Exp $
- * $DragonFly: src/sys/dev/netif/ed/Attic/if_ed_cbus.c,v 1.4 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ed/Attic/if_ed_cbus.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -298,7 +298,7 @@ static driver_t ed_isa_driver = {
 
 static devclass_t ed_isa_devclass;
 
-DRIVER_MODULE(ed, isa, ed_isa_driver, ed_isa_devclass, 0, 0);
+DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_isa_devclass, 0, 0);
 
 #ifdef PC98
 /*
diff --git a/sys/dev/netif/ed/if_ed_isa.c b/sys/dev/netif/ed/if_ed_isa.c
index 0d65098abf..d55e2ceaad 100644
--- a/sys/dev/netif/ed/if_ed_isa.c
+++ b/sys/dev/netif/ed/if_ed_isa.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.5.2.2 2002/07/29 07:52:57 takawata Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.4 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -157,4 +157,4 @@ static driver_t ed_isa_driver = {
 
 static devclass_t ed_isa_devclass;
 
-DRIVER_MODULE(ed, isa, ed_isa_driver, ed_isa_devclass, 0, 0);
+DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_isa_devclass, 0, 0);
diff --git a/sys/dev/netif/ed/if_ed_pccard.c b/sys/dev/netif/ed/if_ed_pccard.c
index 0d5c2a71f7..5b1b426bac 100644
--- a/sys/dev/netif/ed/if_ed_pccard.c
+++ b/sys/dev/netif/ed/if_ed_pccard.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.9.2.6 2001/07/25 18:06:01 iedowse Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.5 2003/08/07 21:17:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.6 2003/11/20 22:07:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -101,7 +101,7 @@ static driver_t ed_pccard_driver = {
 
 static devclass_t ed_pccard_devclass;
 
-DRIVER_MODULE(ed, pccard, ed_pccard_driver, ed_pccard_devclass, 0, 0);
+DRIVER_MODULE(if_ed, pccard, ed_pccard_driver, ed_pccard_devclass, 0, 0);
 DRIVER_MODULE(miibus, ed, miibus_driver, miibus_devclass, 0, 0);
 
 /*
diff --git a/sys/dev/netif/ed/if_ed_pci.c b/sys/dev/netif/ed/if_ed_pci.c
index 08174624a1..30b86de3bf 100644
--- a/sys/dev/netif/ed/if_ed_pci.c
+++ b/sys/dev/netif/ed/if_ed_pci.c
@@ -18,7 +18,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.23.2.1 2000/09/10 08:45:11 nyan Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.4 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -123,4 +123,4 @@ static driver_t ed_pci_driver = {
 
 static devclass_t ed_devclass;
 
-DRIVER_MODULE(ed, pci, ed_pci_driver, ed_devclass, 0, 0);
+DRIVER_MODULE(if_ed, pci, ed_pci_driver, ed_devclass, 0, 0);
diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c
index e8b78a48f9..890cb4f98a 100644
--- a/sys/dev/netif/el/if_el.c
+++ b/sys/dev/netif/el/if_el.c
@@ -7,7 +7,7 @@
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
  * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.47.2.2 2000/07/17 21:24:30 archie Exp $
- * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.4 2003/08/07 21:17:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -30,6 +30,8 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -44,6 +46,8 @@
 #include <bus/isa/i386/isa_device.h>
 #include "if_elreg.h"
 
+DECLARE_DUMMY_MODULE(if_el);
+
 /* For debugging convenience */
 #ifdef EL_DEBUG
 #define dprintf(x) printf x
diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
index 12f9e94c9b..04391885d6 100644
--- a/sys/dev/netif/em/if_em.c
+++ b/sys/dev/netif/em/if_em.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.15 2003/06/09 22:10:15 pdeuskar Exp $*/
-/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.3 2003/08/07 21:17:01 dillon Exp $*/
+/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.4 2003/11/20 22:07:27 dillon Exp $*/
 
 #include "if_em.h"
 
@@ -180,6 +180,8 @@ static driver_t em_driver = {
 };
 
 static devclass_t em_devclass;
+
+DECLARE_DUMMY_MODULE(if_em);
 DRIVER_MODULE(if_em, pci, em_driver, em_devclass, 0, 0);
 
 /*********************************************************************
diff --git a/sys/dev/netif/en_pci/if_en_pci.c b/sys/dev/netif/en_pci/if_en_pci.c
index f0850d9169..c8e70b7749 100644
--- a/sys/dev/netif/en_pci/if_en_pci.c
+++ b/sys/dev/netif/en_pci/if_en_pci.c
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_en_pci.c,v 1.12 1999/08/21 22:10:49 msmith Exp $
- * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.4 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
  */
 
 /*
@@ -118,7 +118,7 @@ static struct pci_device endevice = {
 	NULL,
 };  
 
-COMPAT_PCI_DRIVER (en, endevice);
+COMPAT_PCI_DRIVER (if_en, endevice);
 
 /*
  * local defines (PCI specific stuff)
diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c
index 864db50850..97855c2aad 100644
--- a/sys/dev/netif/ep/if_ep.c
+++ b/sys/dev/netif/ep/if_ep.c
@@ -39,7 +39,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.3 2002/03/06 07:26:35 imp Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.5 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.6 2003/11/20 22:07:27 dillon Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -117,6 +117,8 @@ static void	epstop		(struct ep_softc *);
 static void	epread		(struct ep_softc *);
 static int	eeprom_rdy	(struct ep_softc *);
 
+DECLARE_DUMMY_MODULE(if_ep);
+
 #define EP_FTST(sc, f)	(sc->stat &   (f))
 #define EP_FSET(sc, f)	(sc->stat |=  (f))
 #define EP_FRST(sc, f)	(sc->stat &= ~(f))
diff --git a/sys/dev/netif/ep/if_ep_eisa.c b/sys/dev/netif/ep/if_ep_eisa.c
index 1df213c2b1..1cdec2f846 100644
--- a/sys/dev/netif/ep/if_ep_eisa.c
+++ b/sys/dev/netif/ep/if_ep_eisa.c
@@ -20,7 +20,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.18 2000/01/14 07:14:00 peter Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.4 2003/08/27 09:38:30 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.5 2003/11/20 22:07:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -264,4 +264,4 @@ static driver_t ep_eisa_driver = {
 
 extern devclass_t ep_devclass;
 
-DRIVER_MODULE(ep, eisa, ep_eisa_driver, ep_devclass, 0, 0);
+DRIVER_MODULE(if_ep, eisa, ep_eisa_driver, ep_devclass, 0, 0);
diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c
index 616a8660b5..3680a88783 100644
--- a/sys/dev/netif/ep/if_ep_isa.c
+++ b/sys/dev/netif/ep/if_ep_isa.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_isa.c,v 1.8.2.1 2000/12/16 03:47:57 nyan Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.3 2003/08/07 21:17:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.4 2003/11/20 22:07:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -359,4 +359,4 @@ static driver_t ep_isa_driver = {
 
 extern devclass_t ep_devclass;
 
-DRIVER_MODULE(ep, isa, ep_isa_driver, ep_devclass, 0, 0);
+DRIVER_MODULE(if_ep, isa, ep_isa_driver, ep_devclass, 0, 0);
diff --git a/sys/dev/netif/ep/if_ep_mca.c b/sys/dev/netif/ep/if_ep_mca.c
index 2cc1d6ae5c..4d2a86bbbd 100644
--- a/sys/dev/netif/ep/if_ep_mca.c
+++ b/sys/dev/netif/ep/if_ep_mca.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_mca.c,v 1.2 1999/10/27 06:25:15 mdodd Exp $
- * $DragonFly: src/sys/dev/netif/ep/Attic/if_ep_mca.c,v 1.3 2003/08/07 21:17:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ep/Attic/if_ep_mca.c,v 1.4 2003/11/20 22:07:27 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -163,4 +163,4 @@ static driver_t ep_mca_driver = {
 
 static devclass_t ep_devclass;
 
-DRIVER_MODULE(ep, mca, ep_mca_driver, ep_devclass, 0, 0);
+DRIVER_MODULE(if_ep, mca, ep_mca_driver, ep_devclass, 0, 0);
diff --git a/sys/dev/netif/ep/if_ep_pccard.c b/sys/dev/netif/ep/if_ep_pccard.c
index d4a779b1ff..6173f11540 100644
--- a/sys/dev/netif/ep/if_ep_pccard.c
+++ b/sys/dev/netif/ep/if_ep_pccard.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ep/if_ep_pccard.c,v 1.12.2.2 2000/08/08 23:55:02 peter Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.3 2003/08/07 21:17:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.4 2003/11/20 22:07:27 dillon Exp $
  */
 
 /*
@@ -253,4 +253,4 @@ static driver_t ep_pccard_driver = {
 
 extern devclass_t ep_devclass;
 
-DRIVER_MODULE(ep, pccard, ep_pccard_driver, ep_devclass, 0, 0);
+DRIVER_MODULE(if_ep, pccard, ep_pccard_driver, ep_devclass, 0, 0);
diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c
index a67650e0a6..d0551c8d3e 100644
--- a/sys/dev/netif/ex/if_ex.c
+++ b/sys/dev/netif/ex/if_ex.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.3 2001/03/05 05:33:20 imp Exp $
- * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.5 2003/08/27 09:38:31 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.6 2003/11/20 22:07:28 dillon Exp $
  *
  * MAINTAINER: Matthew N. Dodd <winter@jurai.net>
  *                             <mdodd@FreeBSD.org>
@@ -70,6 +70,8 @@
 #include "if_exreg.h"
 #include "if_exvar.h"
 
+DECLARE_DUMMY_MODULE(if_ex);
+
 #ifdef EXDEBUG
 # define Start_End 1
 # define Rcvd_Pkts 2
diff --git a/sys/dev/netif/ex/if_ex_isa.c b/sys/dev/netif/ex/if_ex_isa.c
index b95648be7c..0220476317 100644
--- a/sys/dev/netif/ex/if_ex_isa.c
+++ b/sys/dev/netif/ex/if_ex_isa.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.3.2.1 2001/03/05 05:33:20 imp Exp $
- *	$DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.5 2003/08/27 09:38:31 rob Exp $
+ *	$DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.6 2003/11/20 22:07:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -79,7 +79,7 @@ static driver_t ex_driver = {
 
 devclass_t ex_devclass;
 
-DRIVER_MODULE(ex, isa, ex_driver, ex_devclass, 0, 0);
+DRIVER_MODULE(if_ex, isa, ex_driver, ex_devclass, 0, 0);
 
 static struct isa_pnp_id ex_ids[] = {
 	{ 0x3110d425,	NULL },	/* INT1031 */
diff --git a/sys/dev/netif/ex/if_ex_pccard.c b/sys/dev/netif/ex/if_ex_pccard.c
index 37ab9338ce..952b0b567c 100644
--- a/sys/dev/netif/ex/if_ex_pccard.c
+++ b/sys/dev/netif/ex/if_ex_pccard.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/ex/if_ex_pccard.c,v 1.2.2.1 2001/03/05 05:33:20 imp Exp $
- *	$DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.4 2003/08/27 09:38:31 rob Exp $
+ *	$DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -71,7 +71,7 @@ static driver_t ex_pccard_driver = {
 
 extern devclass_t ex_devclass;
 
-DRIVER_MODULE(ex, pccard, ex_pccard_driver, ex_devclass, 0, 0);
+DRIVER_MODULE(if_ex, pccard, ex_pccard_driver, ex_devclass, 0, 0);
 
 static int
 ex_pccard_probe(device_t dev)
diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index 1e27192270..85fd909de2 100644
--- a/sys/dev/netif/fe/if_fe.c
+++ b/sys/dev/netif/fe/if_fe.c
@@ -22,7 +22,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.4 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
@@ -79,6 +79,8 @@
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/interrupt.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
 #include <machine/clock.h>
 
 #include <sys/bus.h>
@@ -164,6 +166,8 @@ static void	fe_loadmar	( struct fe_softc * );
 static void	fe_emptybuffer	( struct fe_softc * );
 #endif
 
+DECLARE_DUMMY_MODULE(if_fe);
+
 /*
  * Fe driver specific constants which relate to 86960/86965.
  */
diff --git a/sys/dev/netif/fe/if_fe_cbus.c b/sys/dev/netif/fe/if_fe_cbus.c
index 8e4e0bc104..87c9de5ddc 100644
--- a/sys/dev/netif/fe/if_fe_cbus.c
+++ b/sys/dev/netif/fe/if_fe_cbus.c
@@ -20,7 +20,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fe/if_fe_cbus.c,v 1.2.2.5 2002/02/09 03:12:27 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/Attic/if_fe_cbus.c,v 1.3 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fe/Attic/if_fe_cbus.c,v 1.4 2003/11/20 22:07:28 dillon Exp $
  */
 
 #include "opt_fe.h"
@@ -78,7 +78,7 @@ static driver_t fe_isa_driver = {
 	sizeof (struct fe_softc)
 };
 
-DRIVER_MODULE(fe, isa, fe_isa_driver, fe_devclass, 0, 0);
+DRIVER_MODULE(if_fe, isa, fe_isa_driver, fe_devclass, 0, 0);
 
 
 static int fe98_alloc_port(device_t, int);
diff --git a/sys/dev/netif/fe/if_fe_isa.c b/sys/dev/netif/fe/if_fe_isa.c
index 0c29826118..daa27d37ce 100644
--- a/sys/dev/netif/fe/if_fe_isa.c
+++ b/sys/dev/netif/fe/if_fe_isa.c
@@ -20,7 +20,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fe/if_fe_isa.c,v 1.2.2.1 2000/09/22 10:01:47 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/if_fe_isa.c,v 1.3 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe_isa.c,v 1.4 2003/11/20 22:07:28 dillon Exp $
  */
 
 #include "opt_fe.h"
@@ -72,7 +72,7 @@ static driver_t fe_isa_driver = {
 	sizeof (struct fe_softc)
 };
 
-DRIVER_MODULE(fe, isa, fe_isa_driver, fe_devclass, 0, 0);
+DRIVER_MODULE(if_fe, isa, fe_isa_driver, fe_devclass, 0, 0);
 
 
 static int fe_probe_ssi(device_t);
diff --git a/sys/dev/netif/fe/if_fe_pccard.c b/sys/dev/netif/fe/if_fe_pccard.c
index 37f756529e..8b547a7d99 100644
--- a/sys/dev/netif/fe/if_fe_pccard.c
+++ b/sys/dev/netif/fe/if_fe_pccard.c
@@ -20,7 +20,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.2.2.1 2000/09/22 10:01:47 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/if_fe_pccard.c,v 1.3 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe_pccard.c,v 1.4 2003/11/20 22:07:28 dillon Exp $
  */
 
 #include "opt_fe.h"
@@ -74,7 +74,7 @@ static driver_t fe_pccard_driver = {
 	sizeof (struct fe_softc)
 };
 
-DRIVER_MODULE(fe, pccard, fe_pccard_driver, fe_devclass, 0, 0);
+DRIVER_MODULE(if_fe, pccard, fe_pccard_driver, fe_devclass, 0, 0);
 
 
 static int fe_probe_mbh(device_t);
diff --git a/sys/dev/netif/fea/if_fea.c b/sys/dev/netif/fea/if_fea.c
index d141ee2575..52be71f51c 100644
--- a/sys/dev/netif/fea/if_fea.c
+++ b/sys/dev/netif/fea/if_fea.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.19 2000/01/14 07:14:03 peter Exp $
- * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.4 2003/08/27 09:38:31 rob Exp $
+ * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
  */
 
 /*
@@ -268,4 +268,6 @@ static driver_t pdq_eisa_driver = {
 
 static devclass_t pdq_devclass;
 
-DRIVER_MODULE(pdq, eisa, pdq_eisa_driver, pdq_devclass, 0, 0);
+DECLARE_DUMMY_MODULE(if_fea);
+DRIVER_MODULE(if_pdq, eisa, pdq_eisa_driver, pdq_devclass, 0, 0);
+
diff --git a/sys/dev/netif/fpa/if_fpa.c b/sys/dev/netif/fpa/if_fpa.c
index 7eee8bd0ae..bfbf493eb1 100644
--- a/sys/dev/netif/fpa/if_fpa.c
+++ b/sys/dev/netif/fpa/if_fpa.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.13 1999/08/28 00:50:50 peter Exp $
- * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.4 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
  *
  */
 
@@ -217,7 +217,7 @@ static struct pci_device fpadevice = {
     NULL
 };
 
-COMPAT_PCI_DRIVER (fpa, fpadevice);
+COMPAT_PCI_DRIVER (if_fpa, fpadevice);
 
 #elif defined(__bsdi__)
 
diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c
index 2699c5a335..c289e0f163 100644
--- a/sys/dev/netif/fwe/if_fwe.c
+++ b/sys/dev/netif/fwe/if_fwe.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  * 
  * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.1.2.11 2003/04/28 03:29:18 simokawa Exp $
- * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.4 2003/08/27 09:38:31 rob Exp $
+ * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
  */
 
 #include "opt_inet.h"
@@ -650,6 +650,7 @@ static driver_t fwe_driver = {
 };
 
 
-DRIVER_MODULE(fwe, firewire, fwe_driver, fwe_devclass, 0, 0);
-MODULE_VERSION(fwe, 1);
-MODULE_DEPEND(fwe, firewire, 1, 1, 1);
+DECLARE_DUMMY_MODULE(if_fwe);
+DRIVER_MODULE(if_fwe, firewire, fwe_driver, fwe_devclass, 0, 0);
+MODULE_VERSION(if_fwe, 1);
+MODULE_DEPEND(if_fwe, firewire, 1, 1, 1);
diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c
index 24e74ad778..dbd97a7655 100644
--- a/sys/dev/netif/fxp/if_fxp.c
+++ b/sys/dev/netif/fxp/if_fxp.c
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $
- * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.3 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.4 2003/11/20 22:07:28 dillon Exp $
  */
 
 /*
@@ -78,7 +78,6 @@
 #include "if_fxpvar.h"
 #include "rcvbundl.h"
 
-MODULE_DEPEND(fxp, miibus, 1, 1, 1);
 #include "miibus_if.h"
 
 /*
@@ -248,6 +247,8 @@ static driver_t fxp_driver = {
 
 static devclass_t fxp_devclass;
 
+DECLARE_DUMMY_MODULE(if_fxp);
+MODULE_DEPEND(if_fxp, miibus, 1, 1, 1);
 DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0);
 DRIVER_MODULE(if_fxp, cardbus, fxp_driver, fxp_devclass, 0, 0);
 DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0);
diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c
index d9350aef3f..3fc22d3ca1 100644
--- a/sys/dev/netif/gx/if_gx.c
+++ b/sys/dev/netif/gx/if_gx.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.3 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.4 2003/11/20 22:07:28 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -73,7 +73,6 @@
 #include "if_gxreg.h"
 #include "if_gxvar.h"
 
-MODULE_DEPEND(gx, miibus, 1, 1, 1);
 #include "miibus_if.h"
 
 #define TUNABLE_TX_INTR_DELAY	100
@@ -197,6 +196,8 @@ static driver_t gx_driver = {
 
 static devclass_t gx_devclass;
 
+DECLARE_DUMMY_MODULE(if_gx);
+MODULE_DEPEND(if_gx, miibus, 1, 1, 1);
 DRIVER_MODULE(if_gx, pci, gx_driver, gx_devclass, 0, 0);
 DRIVER_MODULE(miibus, gx, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/ic/if_ic.c b/sys/dev/netif/ic/if_ic.c
index d93ded8f15..b7fc47609d 100644
--- a/sys/dev/netif/ic/if_ic.c
+++ b/sys/dev/netif/ic/if_ic.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.8 1999/12/29 04:35:39 peter Exp $
- * $DragonFly: src/sys/dev/netif/ic/if_ic.c,v 1.4 2003/09/15 23:38:12 hsu Exp $
+ * $DragonFly: src/sys/dev/netif/ic/if_ic.c,v 1.5 2003/11/20 22:07:28 dillon Exp $
  */
 
 /*
@@ -447,4 +447,6 @@ error:
 	return(0);
 }
 
-DRIVER_MODULE(ic, iicbus, ic_driver, ic_devclass, 0, 0);
+DECLARE_DUMMY_MODULE(if_ic);
+DRIVER_MODULE(if_ic, iicbus, ic_driver, ic_devclass, 0, 0);
+
diff --git a/sys/dev/netif/ie/if_ie.c b/sys/dev/netif/ie/if_ie.c
index ea546f6c5f..3e33cda282 100644
--- a/sys/dev/netif/ie/if_ie.c
+++ b/sys/dev/netif/ie/if_ie.c
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.72.2.4 2003/03/27 21:01:49 mdodd Exp $
- * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.4 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.5 2003/11/20 22:07:29 dillon Exp $
  */
 
 /*
@@ -153,6 +153,8 @@ static int	ie_debug = IED_RNR;
 
 #endif
 
+DECLARE_DUMMY_MODULE(if_ie);
+
 #define IE_BUF_LEN	ETHER_MAX_LEN	/* length of transmit buffer */
 
 /* Forward declaration */
diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c
index 997e35f015..3d1b40e95f 100644
--- a/sys/dev/netif/kue/if_kue.c
+++ b/sys/dev/netif/kue/if_kue.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $
- * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.3 2003/08/07 21:17:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.4 2003/11/20 22:07:29 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $
  */
@@ -166,6 +166,7 @@ Static driver_t kue_driver = {
 
 Static devclass_t kue_devclass;
 
+DECLARE_DUMMY_MODULE(if_kue);
 DRIVER_MODULE(if_kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
 
 /*
diff --git a/sys/dev/netif/le/if_le.c b/sys/dev/netif/le/if_le.c
index 4a40913eb0..46269bbc31 100644
--- a/sys/dev/netif/le/if_le.c
+++ b/sys/dev/netif/le/if_le.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.56.2.4 2002/06/05 23:24:10 paul Exp $
- * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.5 2003/08/27 09:38:31 rob Exp $
+ * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.6 2003/11/20 22:07:29 dillon Exp $
  */
 
 /*
@@ -47,6 +47,8 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -84,6 +86,8 @@ typedef u_short le_mcbits_t;
  */
 #include <i386/isa/ic/lemac.h>		/* Include LEMAC definitions */
 
+DECLARE_DUMMY_MODULE(if_le);
+
 static int lemac_probe(le_softc_t *sc, const le_board_t *bd, int *msize);
 
 struct le_lemac_info {
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index 444011eca1..01e0c8428b 100644
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.5 2003/08/27 09:38:31 rob Exp $
+ * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.6 2003/11/20 22:07:29 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
  */
@@ -201,6 +201,7 @@ static driver_t lge_driver = {
 
 static devclass_t lge_devclass;
 
+DECLARE_DUMMY_MODULE(if_lge);
 DRIVER_MODULE(if_lge, pci, lge_driver, lge_devclass, 0, 0);
 DRIVER_MODULE(miibus, lge, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/lnc/if_lnc.c b/sys/dev/netif/lnc/if_lnc.c
index 5d230502d7..bbbfacd16a 100644
--- a/sys/dev/netif/lnc/if_lnc.c
+++ b/sys/dev/netif/lnc/if_lnc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_lnc.c,v 1.68.2.5 2002/02/13 00:43:10 dillon Exp $
- * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.4 2003/08/27 09:38:31 rob Exp $
+ * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.5 2003/11/20 22:07:29 dillon Exp $
  */
 
 /*
@@ -78,6 +78,8 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -121,6 +123,8 @@ struct lnc_softc {
 	LNCSTATS_STRUCT
 };
 
+DECLARE_DUMMY_MODULE(if_lnc);
+
 static struct lnc_softc lnc_softc[NLNC];
 
 static char const * const nic_ident[] = {
diff --git a/sys/dev/netif/lnc_p/if_lnc_p.c b/sys/dev/netif/lnc_p/if_lnc_p.c
index 809d04fbad..0eb97b2f84 100644
--- a/sys/dev/netif/lnc_p/if_lnc_p.c
+++ b/sys/dev/netif/lnc_p/if_lnc_p.c
@@ -18,7 +18,7 @@
  *    are met.
  *
  * $FreeBSD: src/sys/pci/if_lnc_p.c,v 1.13 1999/08/28 00:50:51 peter Exp $
- * $DragonFly: src/sys/dev/netif/lnc_p/Attic/if_lnc_p.c,v 1.4 2003/08/27 09:38:31 rob Exp $
+ * $DragonFly: src/sys/dev/netif/lnc_p/Attic/if_lnc_p.c,v 1.5 2003/11/20 22:07:29 dillon Exp $
  */
 
 #include "use_lnc.h"
@@ -48,7 +48,7 @@ static struct pci_device lnc_pci_driver = {
 	NULL
 };
 
-COMPAT_PCI_DRIVER (lnc_pci, lnc_pci_driver);
+COMPAT_PCI_DRIVER (if_lnc_p, lnc_pci_driver);
 
 static const char*
 lnc_pci_probe (pcici_t tag, pcidi_t type)
diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c
index 8f1b37f119..e821050eca 100644
--- a/sys/dev/netif/mn/if_mn.c
+++ b/sys/dev/netif/mn/if_mn.c
@@ -22,7 +22,7 @@
  * this gadget.
  *
  * $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $
- * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.3 2003/08/07 21:17:03 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.4 2003/11/20 22:07:29 dillon Exp $
  */
 
 /*
@@ -1459,4 +1459,6 @@ static driver_t mn_driver = {
 
 static devclass_t mn_devclass;
 
-DRIVER_MODULE(mn, pci, mn_driver, mn_devclass, 0, 0);
+DECLARE_DUMMY_MODULE(if_mn);
+DRIVER_MODULE(if_mn, pci, mn_driver, mn_devclass, 0, 0);
+
diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index 42f5511a96..3bbde1edaf 100644
--- a/sys/dev/netif/my/if_my.c
+++ b/sys/dev/netif/my/if_my.c
@@ -26,7 +26,7 @@
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
  * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $
- * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.4 2003/08/07 21:17:04 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.5 2003/11/20 22:07:29 dillon Exp $
  *
  * Myson fast ethernet PCI NIC driver
  *
@@ -165,6 +165,7 @@ static driver_t my_driver = {
 
 static devclass_t my_devclass;
 
+DECLARE_DUMMY_MODULE(if_my);
 DRIVER_MODULE(if_my, pci, my_driver, my_devclass, 0, 0);
 
 static long
diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c
index 203a275d2c..5c32cc4028 100644
--- a/sys/dev/netif/nge/if_nge.c
+++ b/sys/dev/netif/nge/if_nge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.4 2003/08/07 21:17:04 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.5 2003/11/20 22:07:29 dillon Exp $
  *
  * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $
  */
@@ -128,7 +128,6 @@
 
 #include "if_ngereg.h"
 
-MODULE_DEPEND(nge, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
@@ -227,6 +226,8 @@ static driver_t nge_driver = {
 
 static devclass_t nge_devclass;
 
+DECLARE_DUMMY_MODULE(if_nge);
+MODULE_DEPEND(if_nge, miibus, 1, 1, 1);
 DRIVER_MODULE(if_nge, pci, nge_driver, nge_devclass, 0, 0);
 DRIVER_MODULE(miibus, nge, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index 2d614fbcf2..c058b1db44 100644
--- a/sys/dev/netif/pcn/if_pcn.c
+++ b/sys/dev/netif/pcn/if_pcn.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.5 2003/08/27 09:38:32 rob Exp $
+ * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.6 2003/11/20 22:07:30 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
  */
@@ -179,6 +179,7 @@ static driver_t pcn_driver = {
 
 static devclass_t pcn_devclass;
 
+DECLARE_DUMMY_MODULE(if_pcn);
 DRIVER_MODULE(if_pcn, pci, pcn_driver, pcn_devclass, 0, 0);
 DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/plip/if_plip.c b/sys/dev/netif/plip/if_plip.c
index eb2beef36f..86849e6223 100644
--- a/sys/dev/netif/plip/if_plip.c
+++ b/sys/dev/netif/plip/if_plip.c
@@ -25,7 +25,7 @@
  *
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.19.2.1 2000/05/24 00:20:57 n_hibma Exp $
- * $DragonFly: src/sys/dev/netif/plip/if_plip.c,v 1.4 2003/09/15 23:38:13 hsu Exp $
+ * $DragonFly: src/sys/dev/netif/plip/if_plip.c,v 1.5 2003/11/20 22:07:30 dillon Exp $
  */
 
 /*
@@ -775,4 +775,6 @@ static driver_t lp_driver = {
   sizeof(struct lp_data),
 };
 
-DRIVER_MODULE(plip, ppbus, lp_driver, lp_devclass, 0, 0);
+DECLARE_DUMMY_MODULE(if_plip);
+DRIVER_MODULE(if_plip, ppbus, lp_driver, lp_devclass, 0, 0);
+
diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c
index 8ff839706e..fd2e0ebcee 100644
--- a/sys/dev/netif/ray/if_ray.c
+++ b/sys/dev/netif/ray/if_ray.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $
- * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.6 2003/11/15 21:05:41 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.7 2003/11/20 22:07:30 dillon Exp $
  *
  */
 
@@ -374,7 +374,8 @@ static driver_t ray_driver = {
 
 static devclass_t ray_devclass;
 
-DRIVER_MODULE(ray, pccard, ray_driver, ray_devclass, 0, 0);
+DECLARE_DUMMY_MODULE(if_ray);
+DRIVER_MODULE(if_ray, pccard, ray_driver, ray_devclass, 0, 0);
 
 /* 
  * Probe for the card by checking its startup results.
diff --git a/sys/dev/netif/rdp/if_rdp.c b/sys/dev/netif/rdp/if_rdp.c
index 982b0a306b..1e24537784 100644
--- a/sys/dev/netif/rdp/if_rdp.c
+++ b/sys/dev/netif/rdp/if_rdp.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.6.2.2 2000/07/17 21:24:32 archie Exp $
- * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.5 2003/08/27 09:38:32 rob Exp $
+ * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.6 2003/11/20 22:07:30 dillon Exp $
  */
 
 /*
@@ -72,6 +72,8 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -140,6 +142,8 @@ struct rdp_softc {
 	} eeprom;
 };
 
+DECLARE_DUMMY_MODULE(if_rdp);
+
 static struct rdp_softc rdp_softc[NRDP];
 
 /*
diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c
index 0bf7267364..3407c7078c 100644
--- a/sys/dev/netif/rl/if_rl.c
+++ b/sys/dev/netif/rl/if_rl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.5 2003/08/27 09:38:32 rob Exp $
+ * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.6 2003/11/20 22:07:30 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $
  */
@@ -232,6 +232,7 @@ static driver_t rl_driver = {
 
 static devclass_t rl_devclass;
 
+DECLARE_DUMMY_MODULE(if_rl);
 DRIVER_MODULE(if_rl, pci, rl_driver, rl_devclass, 0, 0);
 DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c
index 68148fe56c..042517f7d1 100644
--- a/sys/dev/netif/sbni/if_sbni.c
+++ b/sys/dev/netif/sbni/if_sbni.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.8 2003/11/14 22:58:32 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.9 2003/11/20 22:07:30 dillon Exp $
  */
 
 /*
@@ -119,6 +119,8 @@ static __inline void	sbni_outb(struct sbni_softc *, enum sbni_reg, u_char);
 static __inline void	sbni_insb(struct sbni_softc *, u_char *, u_int);
 static __inline void	sbni_outsb(struct sbni_softc *, u_char *, u_int);
 
+DECLARE_DUMMY_MODULE(if_sbni);
+
 static u_int32_t crc32tab[];
 
 #ifdef SBNI_DUAL_COMPOUND
diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index c64341030a..ccc5b5c80b 100644
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.6 2003/08/07 21:17:04 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.7 2003/11/20 22:07:30 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -200,6 +200,7 @@ static driver_t sbsh_driver = {
 
 static devclass_t sbsh_devclass;
 
+DECLARE_DUMMY_MODULE(if_sbsh);
 DRIVER_MODULE(if_sbsh, pci, sbsh_driver, sbsh_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index c6e8701917..2fec93c8b6 100644
--- a/sys/dev/netif/sf/if_sf.c
+++ b/sys/dev/netif/sf/if_sf.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
- * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.4 2003/08/27 09:38:32 rob Exp $
+ * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.5 2003/11/20 22:07:30 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
  */
@@ -204,6 +204,7 @@ static driver_t sf_driver = {
 
 static devclass_t sf_devclass;
 
+DECLARE_DUMMY_MODULE(if_sf);
 DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
 DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c
index 66f47c6cb5..84196b7694 100644
--- a/sys/dev/netif/sis/if_sis.c
+++ b/sys/dev/netif/sis/if_sis.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.5 2003/08/27 09:38:32 rob Exp $
+ * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.6 2003/11/20 22:07:30 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $
  */
@@ -199,6 +199,7 @@ static driver_t sis_driver = {
 
 static devclass_t sis_devclass;
 
+DECLARE_DUMMY_MODULE(if_sis);
 DRIVER_MODULE(if_sis, pci, sis_driver, sis_devclass, 0, 0);
 DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index f24660959b..bed484a000 100644
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.8 2003/11/12 22:43:07 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.9 2003/11/20 22:07:30 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
  */
@@ -285,8 +285,9 @@ static driver_t sk_driver = {
 
 static devclass_t sk_devclass;
 
+DECLARE_DUMMY_MODULE(if_sk);
 DRIVER_MODULE(if_sk, pci, skc_driver, skc_devclass, 0, 0);
-DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0);
+DRIVER_MODULE(if_sk, skc, sk_driver, sk_devclass, 0, 0);
 DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);
 
 #define SK_SETBIT(sc, reg, x)		\
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index 8a0d3e8c3d..cc1183207b 100644
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *   $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $
- *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.4 2003/08/07 21:17:05 dillon Exp $
+ *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.5 2003/11/20 22:07:31 dillon Exp $
  */
 
 /*
@@ -144,6 +144,8 @@ static void sn_setmcast(struct sn_softc *);
 static int sn_getmcf(struct arpcom *ac, u_char *mcf);
 static u_int smc_crc(u_char *);
 
+DECLARE_DUMMY_MODULE(if_sn);
+
 /* I (GB) have been unlucky getting the hardware padding
  * to work properly.
  */
diff --git a/sys/dev/netif/snc/if_snc.c b/sys/dev/netif/snc/if_snc.c
index 8dde7e1529..ace5a7889b 100644
--- a/sys/dev/netif/snc/if_snc.c
+++ b/sys/dev/netif/snc/if_snc.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/snc/if_snc.c,v 1.2.2.1 2000/10/21 03:30:03 nyan Exp $
- * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc.c,v 1.3 2003/08/07 21:17:05 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc.c,v 1.4 2003/11/20 22:07:31 dillon Exp $
  */
 
 /*
@@ -42,6 +42,7 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 
+#include <sys/linker_set.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <machine/bus.h>
@@ -70,6 +71,8 @@
 /* devclass for "snc" */
 devclass_t snc_devclass;
 
+DECLARE_DUMMY_MODULE(if_snc);
+
 /****************************************************************
   Resource management functions
  ****************************************************************/
diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c
index a421697372..067f987610 100644
--- a/sys/dev/netif/sr/if_sr.c
+++ b/sys/dev/netif/sr/if_sr.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $
- * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.4 2003/08/16 02:51:59 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.5 2003/11/20 22:07:31 dillon Exp $
  */
 
 /*
@@ -222,6 +222,7 @@ int	etc0vals[] = {
 
 devclass_t sr_devclass;
 #ifndef NETGRAPH
+DECLARE_DUMMY_MODULE(if_sr);
 MODULE_DEPEND(if_sr, sppp, 1, 1, 1);
 #else
 MODULE_DEPEND(ng_sync_sr, netgraph, 1, 1, 1);
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index 89e52b3628..ea6f7e3748 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.5 2003/08/27 09:38:32 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.6 2003/11/20 22:07:31 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
  */
@@ -161,6 +161,7 @@ static driver_t ste_driver = {
 
 static devclass_t ste_devclass;
 
+DECLARE_DUMMY_MODULE(if_ste);
 DRIVER_MODULE(if_ste, pci, ste_driver, ste_devclass, 0, 0);
 DRIVER_MODULE(miibus, ste, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index a6ecf82028..23d6bdf4a4 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.5 2003/08/27 09:38:33 rob Exp $
+ * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.6 2003/11/20 22:07:31 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
  */
@@ -230,6 +230,7 @@ static driver_t ti_driver = {
 
 static devclass_t ti_devclass;
 
+DECLARE_DUMMY_MODULE(if_ti);
 DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
 
 /*
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index e9830572b1..91cdca1008 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.5 2003/08/27 09:38:33 rob Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.6 2003/11/20 22:07:31 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
  */
@@ -355,6 +355,7 @@ static driver_t tl_driver = {
 
 static devclass_t tl_devclass;
 
+DECLARE_DUMMY_MODULE(if_tl);
 DRIVER_MODULE(if_tl, pci, tl_driver, tl_devclass, 0, 0);
 DRIVER_MODULE(miibus, tl, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 1ee84e19ca..8cc2fa4963 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.4 2003/08/07 21:17:06 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.5 2003/11/20 22:07:31 dillon Exp $
  */
 
 /*
@@ -81,8 +81,6 @@
 #include "if_txreg.h"
 #include "if_txvar.h"
 
-MODULE_DEPEND(tx, miibus, 1, 1, 1);
-
 static int epic_ifioctl(struct ifnet *, u_long, caddr_t);
 static void epic_intr(void *);
 static void epic_tx_underrun(epic_softc_t *);
@@ -151,6 +149,8 @@ static driver_t epic_driver = {
 
 static devclass_t epic_devclass;
 
+DECLARE_DUMMY_MODULE(if_tx);
+MODULE_DEPEND(if_tx, miibus, 1, 1, 1);
 DRIVER_MODULE(if_tx, pci, epic_driver, epic_devclass, 0, 0);
 DRIVER_MODULE(miibus, tx, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c
index 880377d573..e798a6cfee 100644
--- a/sys/dev/netif/txp/if_txp.c
+++ b/sys/dev/netif/txp/if_txp.c
@@ -1,6 +1,6 @@
 /*	$OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $	*/
 /*	$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */
-/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.4 2003/08/27 09:38:33 rob Exp $ */
+/*	$DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.5 2003/11/20 22:07:31 dillon Exp $ */
 
 /*
  * Copyright (c) 2001
@@ -178,6 +178,7 @@ static driver_t txp_driver = {
 
 static devclass_t txp_devclass;
 
+DECLARE_DUMMY_MODULE(if_txp);
 DRIVER_MODULE(if_txp, pci, txp_driver, txp_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index 6cef731a3f..8b0ea8fc14 100644
--- a/sys/dev/netif/vr/if_vr.c
+++ b/sys/dev/netif/vr/if_vr.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.5 2003/08/27 09:38:33 rob Exp $
+ * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
  */
@@ -201,6 +201,7 @@ static driver_t vr_driver = {
 
 static devclass_t vr_devclass;
 
+DECLARE_DUMMY_MODULE(if_vr);
 DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
 DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c
index c144663ca4..de3829d98e 100644
--- a/sys/dev/netif/vx/if_vx.c
+++ b/sys/dev/netif/vx/if_vx.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx.c,v 1.25.2.6 2002/02/13 00:43:10 dillon Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.5 2003/08/27 09:38:33 rob Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
  *
  */
 
@@ -69,6 +69,8 @@
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
 
 #include <net/if.h>
 
@@ -84,6 +86,8 @@
 #define ETHER_MAX_LEN	1518
 #define ETHER_ADDR_LEN	6
 
+DECLARE_DUMMY_MODULE(if_vx);
+
 struct vx_softc *vx_softc[NVX];
 
 u_long vx_count;	/* both PCI and EISA */
diff --git a/sys/dev/netif/vx/if_vx_eisa.c b/sys/dev/netif/vx/if_vx_eisa.c
index 8258eb1ac6..8a83942c0d 100644
--- a/sys/dev/netif/vx/if_vx_eisa.c
+++ b/sys/dev/netif/vx/if_vx_eisa.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.14 2000/01/29 14:50:31 peter Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.4 2003/08/27 09:38:33 rob Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.5 2003/11/20 22:07:32 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -191,4 +191,4 @@ static driver_t vx_eisa_driver = {
 
 static devclass_t vx_devclass;
 
-DRIVER_MODULE(vx, eisa, vx_eisa_driver, vx_devclass, 0, 0);
+DRIVER_MODULE(if_vx, eisa, vx_eisa_driver, vx_devclass, 0, 0);
diff --git a/sys/dev/netif/vx/if_vx_pci.c b/sys/dev/netif/vx/if_vx_pci.c
index 8b6cbbf113..371cfbedc3 100644
--- a/sys/dev/netif/vx/if_vx_pci.c
+++ b/sys/dev/netif/vx/if_vx_pci.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.20 2000/01/29 14:50:32 peter Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.3 2003/08/07 21:17:06 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.4 2003/11/20 22:07:32 dillon Exp $
  */
 
 #include "use_vx.h"
@@ -137,4 +137,4 @@ static struct pci_device vxdevice = {
     NULL
 };
 
-COMPAT_PCI_DRIVER (vx, vxdevice);
+COMPAT_PCI_DRIVER (if_vx_pci, vxdevice);
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index 1410e034a4..a9d1f18e47 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.5 2003/08/27 09:38:33 rob Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
  */
@@ -220,6 +220,7 @@ static driver_t wb_driver = {
 
 static devclass_t wb_devclass;
 
+DECLARE_DUMMY_MODULE(if_wb);
 DRIVER_MODULE(if_wb, pci, wb_driver, wb_devclass, 0, 0);
 DRIVER_MODULE(miibus, wb, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c
index f1447c1439..06f4754886 100644
--- a/sys/dev/netif/wi/if_wi.c
+++ b/sys/dev/netif/wi/if_wi.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.103.2.2 2002/08/02 07:11:34 imp Exp $
- * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.5 2003/08/07 21:17:06 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
  */
 
 /*
@@ -140,6 +140,8 @@ static void wi_media_status(struct ifnet *, struct ifmediareq *);
 static int wi_get_debug(struct wi_softc *, struct wi_req *);
 static int wi_set_debug(struct wi_softc *, struct wi_req *);
 
+DECLARE_DUMMY_MODULE(if_wi);
+
 devclass_t wi_devclass;
 
 struct wi_card_ident wi_card_ident[] = {
diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c
index 2ec37ceb63..1152494a09 100644
--- a/sys/dev/netif/wl/if_wl.c
+++ b/sys/dev/netif/wl/if_wl.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */
-/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.5 2003/08/07 21:17:06 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.6 2003/11/20 22:07:32 dillon Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -262,6 +262,8 @@ static struct wl_softc wl_softc[NWL];
 static int	wlprobe(struct isa_device *);
 static int	wlattach(struct isa_device *);
 
+DECLARE_DUMMY_MODULE(if_wl);
+
 struct isa_driver wldriver = {
     wlprobe, wlattach, "wl", 0
 };
diff --git a/sys/dev/netif/wx/if_wx.c b/sys/dev/netif/wx/if_wx.c
index 5ddf6ab182..077330fcdc 100644
--- a/sys/dev/netif/wx/if_wx.c
+++ b/sys/dev/netif/wx/if_wx.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/pci/if_wx.c,v 1.5.2.12 2003/03/05 18:42:34 njl Exp $ */
-/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.4 2003/11/12 22:08:07 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.5 2003/11/20 22:07:32 dillon Exp $ */
 /*
  * Principal Author: Matthew Jacob <mjacob@feral.com>
  * Copyright (c) 1999, 2001 by Traakan Software
@@ -150,7 +150,6 @@ static int wx_clr_stats = -1;
 SYSCTL_INT(_hw_wx, OID_AUTO, clear_stats, CTLFLAG_RW,
         &wx_clr_stats, 0, "");
 
-
 /*
  * Program multicast addresses.
  *
@@ -504,6 +503,9 @@ static driver_t wx_driver = {
 	"wx", wx_methods, sizeof(wx_softc_t),
 };
 static devclass_t wx_devclass;
+
+DECLARE_DUMMY_MODULE(if_wx);
+MODULE_DEPEND(if_wx, miibus, 1, 1, 1);
 DRIVER_MODULE(if_wx, pci, wx_driver, wx_devclass, 0, 0);
 DRIVER_MODULE(miibus, wx, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/netif/wx/if_wxvar.h b/sys/dev/netif/wx/if_wxvar.h
index 3df25ae48e..b4b0d4b692 100644
--- a/sys/dev/netif/wx/if_wxvar.h
+++ b/sys/dev/netif/wx/if_wxvar.h
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/pci/if_wxvar.h,v 1.4.2.6 2001/10/20 17:44:12 mjacob Exp $ */
-/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wxvar.h,v 1.4 2003/08/07 21:54:29 dillon Exp $ */
+/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wxvar.h,v 1.5 2003/11/20 22:07:32 dillon Exp $ */
 /*                  
  * Principal Author: Matthew Jacob
  * Copyright (c) 1999, 2001 by Traakan Software
@@ -82,7 +82,6 @@
 
 #define	NBPFILTER	1
 
-MODULE_DEPEND(wx, miibus, 1, 1, 1);
 #include "miibus_if.h"
 
 #include "opt_bdg.h"
diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c
index 97f76fbca6..13e2d1d570 100644
--- a/sys/dev/netif/xe/if_xe.c
+++ b/sys/dev/netif/xe/if_xe.c
@@ -25,7 +25,7 @@
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
  * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.13.2.6 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.5 2003/08/07 21:17:07 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.6 2003/11/20 22:07:32 dillon Exp $
  */
 
 /*
@@ -2257,4 +2257,6 @@ static driver_t xe_pccard_driver = {
 
 devclass_t xe_devclass;
 
-DRIVER_MODULE(xe, pccard, xe_pccard_driver, xe_devclass, 0, 0);
+DECLARE_DUMMY_MODULE(if_xe);
+DRIVER_MODULE(if_xe, pccard, xe_pccard_driver, xe_devclass, 0, 0);
+
diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index 1fe6438df9..ff1aea6437 100644
--- a/sys/dev/netif/xl/if_xl.c
+++ b/sys/dev/netif/xl/if_xl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $
- * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.4 2003/08/07 21:17:07 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.5 2003/11/20 22:07:32 dillon Exp $
  *
  * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $
  */
@@ -136,8 +136,6 @@
 #include <bus/pci/pcireg.h>
 #include <bus/pci/pcivar.h>
 
-MODULE_DEPEND(xl, miibus, 1, 1, 1);
-
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
@@ -311,6 +309,8 @@ static driver_t xl_driver = {
 
 static devclass_t xl_devclass;
 
+DECLARE_DUMMY_MODULE(if_xl);
+MODULE_DEPEND(if_xl, miibus, 1, 1, 1);
 DRIVER_MODULE(if_xl, pci, xl_driver, xl_devclass, 0, 0);
 DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/powermng/i386/viapm/viapm.c b/sys/dev/powermng/i386/viapm/viapm.c
index d631ed5b54..b7a77703b6 100644
--- a/sys/dev/powermng/i386/viapm/viapm.c
+++ b/sys/dev/powermng/i386/viapm/viapm.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/viapm.c,v 1.1.2.1 2002/04/19 05:52:15 nsouch Exp $
- * $DragonFly: src/sys/dev/powermng/i386/viapm/viapm.c,v 1.3 2003/08/07 21:17:07 dillon Exp $
+ * $DragonFly: src/sys/dev/powermng/i386/viapm/viapm.c,v 1.4 2003/11/20 22:07:32 dillon Exp $
  *
  */
 #include <sys/param.h>
@@ -927,6 +927,7 @@ static driver_t viapropm_driver = {
 	sizeof(struct viapm_softc),
 };
 
+DECLARE_DUMMY_MODULE(viapm);
 DRIVER_MODULE(viapm, pci, viapm_driver, viapm_devclass, 0, 0);
 DRIVER_MODULE(viapropm, pci, viapropm_driver, viapropm_devclass, 0, 0);
 
diff --git a/sys/dev/powermng/pc98/canbepm/canbepm.c b/sys/dev/powermng/pc98/canbepm/canbepm.c
index 4e1a587773..931566a467 100644
--- a/sys/dev/powermng/pc98/canbepm/canbepm.c
+++ b/sys/dev/powermng/pc98/canbepm/canbepm.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pc98/pc98/canbepm.c,v 1.3.2.1 2003/02/10 13:11:51 nyan Exp $
- * $DragonFly: src/sys/dev/powermng/pc98/canbepm/Attic/canbepm.c,v 1.2 2003/06/17 04:28:55 dillon Exp $
+ * $DragonFly: src/sys/dev/powermng/pc98/canbepm/Attic/canbepm.c,v 1.3 2003/11/20 22:07:33 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -74,6 +74,8 @@ static driver_t canbepm_driver = {
 };
 
 devclass_t canbepm_devclass;
+
+DECLARE_DUMMY_MODULE(canbepm);
 DRIVER_MODULE(canbepm, canbus, canbepm_driver, canbepm_devclass, 0, 0);
 MODULE_DEPEND(canbepm, canbus, 1, 1, 1);
 
diff --git a/sys/dev/raid/aac/aac.c b/sys/dev/raid/aac/aac.c
index 3d670ae0a1..8608e0e2a3 100644
--- a/sys/dev/raid/aac/aac.c
+++ b/sys/dev/raid/aac/aac.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/aac/aac.c,v 1.9.2.14 2003/04/08 13:22:08 scottl Exp $
- *	$DragonFly: src/sys/dev/raid/aac/aac.c,v 1.8 2003/08/07 21:17:07 dillon Exp $
+ *	$DragonFly: src/sys/dev/raid/aac/aac.c,v 1.9 2003/11/20 22:07:33 dillon Exp $
  */
 
 /*
@@ -210,6 +210,8 @@ static struct cdevsw aac_cdevsw = {
 	nopsize			/* psize */
 };
 
+DECLARE_DUMMY_MODULE(aac);
+
 MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver");
 
 /* sysctl node */
diff --git a/sys/dev/raid/amr/amr.c b/sys/dev/raid/amr/amr.c
index b574e410bb..6473113d7f 100644
--- a/sys/dev/raid/amr/amr.c
+++ b/sys/dev/raid/amr/amr.c
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/amr/amr.c,v 1.7.2.13 2003/01/15 13:41:18 emoore Exp $
- *	$DragonFly: src/sys/dev/raid/amr/amr.c,v 1.6 2003/10/13 06:56:13 hmp Exp $
+ *	$DragonFly: src/sys/dev/raid/amr/amr.c,v 1.7 2003/11/20 22:07:33 dillon Exp $
  */
 
 /*
@@ -175,6 +175,8 @@ static void	amr_printcommand(struct amr_command *ac);
 #endif
 #endif
 
+DECLARE_DUMMY_MODULE(amr);
+
 /********************************************************************************
  ********************************************************************************
                                                                       Inline Glue
diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c
index 5246f97b57..790c286259 100644
--- a/sys/dev/raid/asr/asr.c
+++ b/sys/dev/raid/asr/asr.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/dev/asr/asr.c,v 1.3.2.2 2001/08/23 05:21:29 scottl Exp $ */
-/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.10 2003/08/27 06:48:14 rob Exp $ */
+/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.11 2003/11/20 22:07:33 dillon Exp $ */
 /*
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000-2001 Adaptec Corporation
@@ -502,6 +502,7 @@ STATIC driver_t asr_driver = {
 
 STATIC devclass_t asr_devclass;
 
+DECLARE_DUMMY_MODULE(asr);
 DRIVER_MODULE(asr, pci, asr_driver, asr_devclass, 0, 0);
 
 STATIC device_method_t domino_methods[] = {
diff --git a/sys/dev/raid/ciss/ciss.c b/sys/dev/raid/ciss/ciss.c
index 51fa9e50d5..b86a434210 100644
--- a/sys/dev/raid/ciss/ciss.c
+++ b/sys/dev/raid/ciss/ciss.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.2.2.6 2003/02/18 22:27:41 ps Exp $
- *	$DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.4 2003/08/07 21:17:08 dillon Exp $
+ *	$DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.5 2003/11/20 22:07:33 dillon Exp $
  */
 
 /*
@@ -205,6 +205,8 @@ static driver_t ciss_pci_driver = {
 };
 
 static devclass_t	ciss_devclass;
+
+DECLARE_DUMMY_MODULE(ciss);
 DRIVER_MODULE(ciss, pci, ciss_pci_driver, ciss_devclass, 0, 0);
 
 /*
diff --git a/sys/dev/raid/ida/ida.c b/sys/dev/raid/ida/ida.c
index 6928b9b5b4..5ab3358c67 100644
--- a/sys/dev/raid/ida/ida.c
+++ b/sys/dev/raid/ida/ida.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ida/ida.c,v 1.7.2.3 2001/03/01 01:57:32 ps Exp $
- * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.5 2003/08/07 21:17:09 dillon Exp $
+ * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.6 2003/11/20 22:07:33 dillon Exp $
  */
 
 /*
@@ -71,6 +71,8 @@ static void ida_start(struct ida_softc *ida);
 static void ida_done(struct ida_softc *ida, struct ida_qcb *qcb);
 static int ida_wait(struct ida_softc *ida, struct ida_qcb *qcb);
 
+DECLARE_DUMMY_MODULE(ida);
+
 void
 ida_free(struct ida_softc *ida)
 {
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 75877116f6..d5bab2748e 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/kern_linker.c,v 1.41.2.3 2001/11/21 17:50:35 luigi Exp $
- * $DragonFly: src/sys/kern/kern_linker.c,v 1.14 2003/11/14 00:37:22 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_linker.c,v 1.15 2003/11/20 22:07:33 dillon Exp $
  */
 
 #include "opt_ddb.h"
@@ -249,6 +249,12 @@ linker_load_file(const char* filename, linker_file_t* result)
 	lf->refs++;
 	goto out;
     }
+    if (find_mod_metadata(filename)) {
+	if (linker_kernel_file)
+	    ++linker_kernel_file->refs;
+	*result = linker_kernel_file;
+	goto out;
+    }
 
     koname = malloc(strlen(filename) + 4, M_LINKER, M_WAITOK);
     if (koname == NULL) {
@@ -294,8 +300,9 @@ linker_load_file(const char* filename, linker_file_t* result)
 	     */
 	    if (error != EEXIST)
 		    error = ENOEXEC;
-    } else
+    } else {
 	error = ENOENT;		/* Nothing found */
+    }
 
 out:
     if (koname)
@@ -908,7 +915,10 @@ out:
     return error;
 }
 
-static struct mod_metadata *
+/*
+ * Look for module metadata in the static kernel
+ */
+struct mod_metadata *
 find_mod_metadata(const char *modname)
 {
     int len;
@@ -916,7 +926,8 @@ find_mod_metadata(const char *modname)
     struct mod_metadata *mdt;
 
     /*
-     * Strip path prefixes and any dot extension
+     * Strip path prefixes and any dot extension.  MDT_MODULE names
+     * are just the module name without a path or ".ko".
      */
     for (len = strlen(modname) - 1; len >= 0; --len) {
 	if (modname[len] == '/')
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 1a209a941c..5068065524 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/link_elf.c,v 1.24 1999/12/24 15:33:36 bde Exp $
- * $DragonFly: src/sys/kern/link_elf.c,v 1.9 2003/11/13 22:02:42 dillon Exp $
+ * $DragonFly: src/sys/kern/link_elf.c,v 1.10 2003/11/20 22:07:33 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -338,7 +338,9 @@ link_elf_load_module(const char *filename, linker_file_t *result)
     int			error;
     vm_offset_t		dp;
 
-    /* Look to see if we have the module preloaded */
+    /*
+     * Look to see if we have the module preloaded.
+     */
     modptr = preload_search_by_name(filename);
     if (modptr == NULL)
 	return (link_elf_load_file(filename, result));
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 3b265cfa69..c7c61ccb54 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/kern/subr_module.c,v 1.6 1999/10/11 15:19:10 peter Exp $
- * $DragonFly: src/sys/kern/subr_module.c,v 1.2 2003/06/17 04:28:41 dillon Exp $
+ * $DragonFly: src/sys/kern/subr_module.c,v 1.3 2003/11/20 22:07:33 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -46,25 +46,36 @@ preload_search_by_name(const char *name)
     caddr_t	curp;
     u_int32_t	*hdr;
     int		next;
-    
-    if (preload_metadata != NULL) {
-	
-	curp = preload_metadata;
-	for (;;) {
-	    hdr = (u_int32_t *)curp;
-	    if (hdr[0] == 0 && hdr[1] == 0)
-		break;
+    int		i;
+    char	*scanname;
 
-	    /* Search for a MODINFO_NAME field */
-	    if ((hdr[0] == MODINFO_NAME) &&
-		!strcmp(name, curp + sizeof(u_int32_t) * 2))
-		return(curp);
+    if (preload_metadata == NULL)
+	return(NULL);
 
-	    /* skip to next field */
-	    next = sizeof(u_int32_t) * 2 + hdr[1];
-	    next = roundup(next, sizeof(u_long));
-	    curp += next;
+    curp = preload_metadata;
+    for (;;) {
+	hdr = (u_int32_t *)curp;
+	if (hdr[0] == 0 && hdr[1] == 0)
+	    break;
+
+	/*
+	 * Search for a MODINFO_NAME field.  the boot loader really
+	 * ought to strip the path names
+	 */
+	if (hdr[0] == MODINFO_NAME) {
+	    scanname = curp + sizeof(u_int32_t) * 2;
+	    i = strlen(scanname);
+	    while (i > 0 && scanname[i-1] != '/')
+		--i;
+	    if (strcmp(name, scanname) == 0)
+		return(curp);
+	    if (strcmp(name, scanname + i) == 0)
+		return(curp);
 	}
+	/* skip to next field */
+	next = sizeof(u_int32_t) * 2 + hdr[1];
+	next = roundup(next, sizeof(u_long));
+	curp += next;
     }
     return(NULL);
 }
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index a09daf6199..b5aaa8a45c 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/linker.h,v 1.17.2.1 2002/03/11 01:13:53 dd Exp $
- * $DragonFly: src/sys/sys/linker.h,v 1.4 2003/11/10 06:12:17 dillon Exp $
+ * $DragonFly: src/sys/sys/linker.h,v 1.5 2003/11/20 22:07:34 dillon Exp $
  */
 
 #ifndef _SYS_LINKER_H_
@@ -261,6 +261,8 @@ extern caddr_t		preload_search_next_name(caddr_t _base);
 extern caddr_t		preload_search_info(caddr_t _mod, int _inf);
 extern void		preload_delete_name(const char *_name);
 extern void		preload_bootstrap_relocate(vm_offset_t _offset);
+extern struct mod_metadata *find_mod_metadata(const char *modname);
+
 
 #ifdef KLD_DEBUG
 
diff --git a/sys/sys/module.h b/sys/sys/module.h
index bd759c2498..5fe8cf9941 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/module.h,v 1.14.2.3 2002/03/17 11:07:45 alfred Exp $
- * $DragonFly: src/sys/sys/module.h,v 1.4 2003/11/14 00:37:23 dillon Exp $
+ * $DragonFly: src/sys/sys/module.h,v 1.5 2003/11/20 22:07:34 dillon Exp $
  */
 
 #ifndef _SYS_MODULE_H_
@@ -118,6 +118,15 @@ struct mod_metadata {
     SYSINIT(name##module, sub, order, module_register_init, &data) 	\
     struct __hack
 
+/*
+ * This is used to declare a module name that is the same as the KLD
+ * name so the kernel can avoid double-loading modules.  It is typically
+ * necessary when a module is made up of several bus drivers each with
+ * its own separate sysinit.
+ */
+#define DECLARE_DUMMY_MODULE(name)					\
+    MODULE_METADATA(_md_##name, MDT_MODULE, NULL, #name)
+
 #define MODULE_VERSION(mod, ver)
 
 void module_register_init(const void *data);
-- 
2.41.0