Remove bridge(4) from the tree. if_bridge(4) is a full functional

replacement and has additional features which make it superior.

Discussed on:	-arch
Reviewed by:	thompsa
X-MFC-after:	never (RELENG_6 as transition period)

53 files changed, 51 insertions, 59 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index e330ee2..e570a89 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -38,7 +38,6 @@ SUBDIR=	${_3dfx} \
 	bge \
 	${_bios} \
 	${_bktr} \
-	bridge \
 	cam \
 	${_canbepm} \
 	${_canbus} \
diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile
index 2fc3b73..8e2ae03 100644
--- a/sys/modules/agp/Makefile
+++ b/sys/modules/agp/Makefile
@@ -18,7 +18,7 @@ SRCS+=	agp_amd.c
 SRCS+=	agp_amd64.c
 .endif
 SRCS+=	device_if.h bus_if.h agp_if.h pci_if.h
-SRCS+=	opt_bdg.h opt_bus.h
+SRCS+=	opt_bus.h
 MFILES=	kern/device_if.m kern/bus_if.m pci/agp_if.m dev/pci/pci_if.m
 WERROR=
 
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile
index 15e760c..f844b23 100644
--- a/sys/modules/ath/Makefile
+++ b/sys/modules/ath/Makefile
@@ -40,7 +40,7 @@
 
 KMOD=	if_ath
 SRCS=	if_ath.c if_ath_pci.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h
 
 HAL=	${.CURDIR}/../../contrib/dev/ath
 CFLAGS+=  -I. -I${HAL}/freebsd -I${HAL}
diff --git a/sys/modules/ath_rate_amrr/Makefile b/sys/modules/ath_rate_amrr/Makefile
index 22f16d2..fea186e 100644
--- a/sys/modules/ath_rate_amrr/Makefile
+++ b/sys/modules/ath_rate_amrr/Makefile
@@ -40,7 +40,7 @@
 
 KMOD=	ath_rate
 SRCS=	amrr.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h
 
 HAL=	${.CURDIR}/../../contrib/dev/ath
 CFLAGS+=  -I. -I${HAL}/freebsd -I${HAL}
diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile
index e404e4b..b7a6732 100644
--- a/sys/modules/ath_rate_onoe/Makefile
+++ b/sys/modules/ath_rate_onoe/Makefile
@@ -40,7 +40,7 @@
 
 KMOD=	ath_rate
 SRCS=	onoe.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h
 
 HAL=	${.CURDIR}/../../contrib/dev/ath
 CFLAGS+=  -I. -I${HAL}/freebsd -I${HAL}
diff --git a/sys/modules/ath_rate_sample/Makefile b/sys/modules/ath_rate_sample/Makefile
index 1ce6ea3..51c3130 100644
--- a/sys/modules/ath_rate_sample/Makefile
+++ b/sys/modules/ath_rate_sample/Makefile
@@ -40,7 +40,7 @@
 
 KMOD=	ath_rate
 SRCS=	sample.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h
+SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h
 
 HAL=	${.CURDIR}/../../contrib/dev/ath
 CFLAGS+=  -I. -I${HAL}/freebsd -I${HAL}
diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile
index c7bb645..c8b3890 100644
--- a/sys/modules/aue/Makefile
+++ b/sys/modules/aue/Makefile
@@ -4,7 +4,7 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	if_aue
-SRCS=	if_aue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS=	if_aue.c opt_usb.h device_if.h bus_if.h
 SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/axe/Makefile b/sys/modules/axe/Makefile
index fa00d09..4d82d5a 100644
--- a/sys/modules/axe/Makefile
+++ b/sys/modules/axe/Makefile
@@ -4,7 +4,7 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	if_axe
-SRCS=	if_axe.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS=	if_axe.c opt_usb.h device_if.h bus_if.h
 SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/bfe/Makefile b/sys/modules/bfe/Makefile
index 6fbe93a..19413f7 100644
--- a/sys/modules/bfe/Makefile
+++ b/sys/modules/bfe/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/bfe
 
 KMOD=	if_bfe
-SRCS=	if_bfe.c miibus_if.h miidevs.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_bfe.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/bge/Makefile b/sys/modules/bge/Makefile
index 53d8e54..3f66451 100644
--- a/sys/modules/bge/Makefile
+++ b/sys/modules/bge/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/bge
 
 KMOD=	if_bge
-SRCS=	opt_bge.h if_bge.c miibus_if.h miidevs.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	opt_bge.h if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/bridge/Makefile b/sys/modules/bridge/Makefile
deleted file mode 100644
index d2c1e32..0000000
--- a/sys/modules/bridge/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../net
-KMOD=	bridge
-SRCS=	bridge.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/cdce/Makefile b/sys/modules/cdce/Makefile
index c82754d..9942ded 100644
--- a/sys/modules/cdce/Makefile
+++ b/sys/modules/cdce/Makefile
@@ -4,7 +4,7 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	if_cdce
-SRCS=	if_cdce.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS=	if_cdce.c opt_usb.h device_if.h bus_if.h
 SRCS+=	usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile
index 939e714..ae31329 100644
--- a/sys/modules/cue/Makefile
+++ b/sys/modules/cue/Makefile
@@ -4,7 +4,7 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	if_cue
-SRCS=	if_cue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS=	if_cue.c opt_usb.h device_if.h bus_if.h
 SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile
index ac56533..915d444 100644
--- a/sys/modules/dc/Makefile
+++ b/sys/modules/dc/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_dc
-SRCS=	if_dc.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_dc.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/de/Makefile b/sys/modules/de/Makefile
index cf07c46..12f3caf 100644
--- a/sys/modules/de/Makefile
+++ b/sys/modules/de/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_de
-SRCS=	if_de.c opt_bdg.h opt_ddb.h device_if.h bus_if.h pci_if.h
+SRCS=	if_de.c opt_ddb.h device_if.h bus_if.h pci_if.h
 
 # Compile-time options.
 
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index 18f6eed..84ccffe 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -2,6 +2,6 @@
 
 .PATH:  ${.CURDIR}/../../netinet
 KMOD=   dummynet
-SRCS=   ip_dummynet.c opt_bdg.h
+SRCS=   ip_dummynet.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile
index 9518d68..21c6e16 100644
--- a/sys/modules/em/Makefile
+++ b/sys/modules/em/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	if_em
 SRCS=	if_em.c if_em_hw.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS+=	device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index 0904e1a..b80c3ec 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/fxp
 
 KMOD=	if_fxp
-SRCS=	if_fxp.c opt_bdg.h device_if.h bus_if.h pci_if.h miibus_if.h
+SRCS=	if_fxp.c device_if.h bus_if.h pci_if.h miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile
index 33e6a77..a3f4f85 100644
--- a/sys/modules/hifn/Makefile
+++ b/sys/modules/hifn/Makefile
@@ -4,7 +4,7 @@
 KMOD	= hifn
 SRCS	= hifn7751.c opt_hifn.h
 SRCS   += device_if.h bus_if.h pci_if.h
-SRCS   += opt_bdg.h opt_bus.h crypto_if.h
+SRCS   += opt_bus.h crypto_if.h
 
 opt_hifn.h:
 	echo "#define HIFN_DEBUG 1" > opt_hifn.h
diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile
index cbc2ed0..0830aec 100644
--- a/sys/modules/if_ndis/Makefile
+++ b/sys/modules/if_ndis/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	if_ndis
 SRCS=	if_ndis.c if_ndis_pci.c if_ndis_pccard.c if_ndis_usb.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h
+SRCS+=	device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h
 SRCS+=	opt_usb.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ipw/Makefile b/sys/modules/ipw/Makefile
index 8ef8135..741d852 100644
--- a/sys/modules/ipw/Makefile
+++ b/sys/modules/ipw/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/ipw
 
 KMOD    = if_ipw
-SRCS    = if_ipw.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS    = if_ipw.c device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/iwi/Makefile b/sys/modules/iwi/Makefile
index a5a9605..60c6051 100644
--- a/sys/modules/iwi/Makefile
+++ b/sys/modules/iwi/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/iwi
 
 KMOD    = if_iwi
-SRCS    = if_iwi.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS    = if_iwi.c device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ixgb/Makefile b/sys/modules/ixgb/Makefile
index 4396c2d..16e5975 100644
--- a/sys/modules/ixgb/Makefile
+++ b/sys/modules/ixgb/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	if_ixgb
 SRCS=	if_ixgb.c ixgb_hw.c ixgb_ee.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS+=	device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/kue/Makefile b/sys/modules/kue/Makefile
index 8569f16..d5271d1 100644
--- a/sys/modules/kue/Makefile
+++ b/sys/modules/kue/Makefile
@@ -4,7 +4,7 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	if_kue
-SRCS=	if_kue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS=	if_kue.c opt_usb.h device_if.h bus_if.h
 SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/lge/Makefile b/sys/modules/lge/Makefile
index 0728e6e..810e220 100644
--- a/sys/modules/lge/Makefile
+++ b/sys/modules/lge/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/lge
 
 KMOD=	if_lge
-SRCS=	if_lge.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_lge.c miibus_if.h device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ncv/Makefile b/sys/modules/ncv/Makefile
index b1a273a..0181db8 100644
--- a/sys/modules/ncv/Makefile
+++ b/sys/modules/ncv/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	ncv
 SRCS=	ncr53c500_pccard.c ncr53c500.c 
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
+SRCS+=	device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
 SRCS+=	opt_cam.h opt_scsi.h opt_ddb.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ndis/Makefile b/sys/modules/ndis/Makefile
index 688cf97..2d14b18 100644
--- a/sys/modules/ndis/Makefile
+++ b/sys/modules/ndis/Makefile
@@ -5,7 +5,7 @@
 KMOD=	ndis
 SRCS=	subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c
 SRCS+=	kern_windrv.c subr_usbd.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h vnode_if.h
+SRCS+=	device_if.h bus_if.h pci_if.h vnode_if.h
 
 .if ${MACHINE_ARCH} == "amd64"
 SRCS+=	winx64_wrap.S
diff --git a/sys/modules/nge/Makefile b/sys/modules/nge/Makefile
index 15dc955..4bb68cd 100644
--- a/sys/modules/nge/Makefile
+++ b/sys/modules/nge/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/nge
 
 KMOD=	if_nge
-SRCS=	if_nge.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_nge.c miibus_if.h device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nsp/Makefile b/sys/modules/nsp/Makefile
index 3cdc705..1773286 100644
--- a/sys/modules/nsp/Makefile
+++ b/sys/modules/nsp/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	nsp
 SRCS=	nsp.c nsp_pccard.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
+SRCS+=	device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
 SRCS+=	opt_cam.h opt_scsi.h opt_ddb.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/pcn/Makefile b/sys/modules/pcn/Makefile
index 637692e..c09af2d 100644
--- a/sys/modules/pcn/Makefile
+++ b/sys/modules/pcn/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_pcn
-SRCS=	if_pcn.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_pcn.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ral/Makefile b/sys/modules/ral/Makefile
index 002d1e8..b3dcc69 100644
--- a/sys/modules/ral/Makefile
+++ b/sys/modules/ral/Makefile
@@ -4,6 +4,6 @@
 
 KMOD    = if_ral
 SRCS    = if_ral.c if_ralrate.c if_ral_pccard.c if_ral_pci.c \
-          opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h
+          device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/re/Makefile b/sys/modules/re/Makefile
index c28eb84..abc9e49 100644
--- a/sys/modules/re/Makefile
+++ b/sys/modules/re/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/re
 
 KMOD=	if_re
-SRCS=	if_re.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_re.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index 23a06a1..e846579 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_rl
-SRCS=	if_rl.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_rl.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/rue/Makefile b/sys/modules/rue/Makefile
index 7e61752..1837eff 100644
--- a/sys/modules/rue/Makefile
+++ b/sys/modules/rue/Makefile
@@ -4,7 +4,7 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	if_rue
-SRCS=	if_rue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
+SRCS=	if_rue.c opt_usb.h device_if.h bus_if.h
 SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/safe/Makefile b/sys/modules/safe/Makefile
index b47a594..6886897 100644
--- a/sys/modules/safe/Makefile
+++ b/sys/modules/safe/Makefile
@@ -30,7 +30,7 @@
 KMOD	= safe
 SRCS	= safe.c opt_safe.h
 SRCS   += device_if.h bus_if.h pci_if.h
-SRCS   += opt_bdg.h opt_bus.h crypto_if.h
+SRCS   += opt_bus.h crypto_if.h
 
 opt_safe.h:
 	echo "#define SAFE_DEBUG 1" > opt_safe.h
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index 1725f09..156a3b2 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_sf
-SRCS=	if_sf.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_sf.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index 8fa9ec4..d16611b8 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_sis
-SRCS=	if_sis.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_sis.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index 28ad56b..dae187c 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_sk
-SRCS=	if_sk.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_sk.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/snc/Makefile b/sys/modules/snc/Makefile
index 4b158fb..b862372 100644
--- a/sys/modules/snc/Makefile
+++ b/sys/modules/snc/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	if_snc
 SRCS=	if_snc.c if_snc_cbus.c if_snc_pccard.c dp83932.c dp83932subr.c
-SRCS+=	opt_inet.h opt_bdg.h device_if.h bus_if.h isa_if.h
+SRCS+=	opt_inet.h device_if.h bus_if.h isa_if.h
 
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index 6ad69a8..7f6e405 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_ste
-SRCS=	if_ste.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_ste.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/stg/Makefile b/sys/modules/stg/Makefile
index 83362d3..b8c0ae8 100644
--- a/sys/modules/stg/Makefile
+++ b/sys/modules/stg/Makefile
@@ -7,7 +7,7 @@ SRCS=	tmc18c30.c tmc18c30_subr.c \
 	tmc18c30_isa.c		isa_if.h \
 	tmc18c30_pccard.c	card_if.h pccarddevs.h \
 	tmc18c30_pci.c		pci_if.h
-SRCS+=	opt_bdg.h device_if.h bus_if.h
+SRCS+=	device_if.h bus_if.h
 SRCS+=	opt_cam.h opt_scsi.h opt_ddb.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index fdafb8a..c74b6ab 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_ti
-SRCS=	if_ti.c opt_bdg.h device_if.h bus_if.h pci_if.h opt_ti.h opt_zero.h
+SRCS=	if_ti.c device_if.h bus_if.h pci_if.h opt_ti.h opt_zero.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index bbd30a1..ea5c808 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_tl
-SRCS=	if_tl.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_tl.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/tx/Makefile b/sys/modules/tx/Makefile
index 8d4ded9..1fe6ba1 100644
--- a/sys/modules/tx/Makefile
+++ b/sys/modules/tx/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/tx
 
 KMOD=	if_tx
-SRCS=	if_tx.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_tx.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h miidevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/txp/Makefile b/sys/modules/txp/Makefile
index 7e1f500..379f3e3 100644
--- a/sys/modules/txp/Makefile
+++ b/sys/modules/txp/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/txp
 
 KMOD=	if_txp
-SRCS=	if_txp.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_txp.c device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ubsec/Makefile b/sys/modules/ubsec/Makefile
index 4c9f58c..8b6799af 100644
--- a/sys/modules/ubsec/Makefile
+++ b/sys/modules/ubsec/Makefile
@@ -4,7 +4,7 @@
 KMOD	= ubsec
 SRCS	= ubsec.c opt_ubsec.h
 SRCS   += device_if.h bus_if.h pci_if.h
-SRCS   += opt_bdg.h opt_bus.h crypto_if.h
+SRCS   += opt_bus.h crypto_if.h
 
 opt_ubsec.h:
 	echo "#define UBSEC_DEBUG 1" > opt_ubsec.h
diff --git a/sys/modules/udav/Makefile b/sys/modules/udav/Makefile
index 02a9d72..fd7acf9 100644
--- a/sys/modules/udav/Makefile
+++ b/sys/modules/udav/Makefile
@@ -3,7 +3,7 @@
 S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 KMOD=	if_udav
-SRCS=	if_udav.c opt_bdg.h opt_usb.h device_if.h bus_if.h opt_inet.h
+SRCS=	if_udav.c opt_usb.h device_if.h bus_if.h opt_inet.h
 SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ural/Makefile b/sys/modules/ural/Makefile
index e347e05..7076e811 100644
--- a/sys/modules/ural/Makefile
+++ b/sys/modules/ural/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD    = if_ural
-SRCS    = if_ural.c opt_bdg.h opt_usb.h device_if.h bus_if.h usbdevs.h
+SRCS    = if_ural.c opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/vge/Makefile b/sys/modules/vge/Makefile
index 8569f68..a06ee56 100644
--- a/sys/modules/vge/Makefile
+++ b/sys/modules/vge/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/vge
 
 KMOD=	if_vge
-SRCS=	if_vge.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_vge.c miibus_if.h device_if.h bus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index fd58ab0..9d0e8db 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_vr
-SRCS=	if_vr.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_vr.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/vx/Makefile b/sys/modules/vx/Makefile
index 37d036f..6293b1a 100644
--- a/sys/modules/vx/Makefile
+++ b/sys/modules/vx/Makefile
@@ -7,6 +7,6 @@ SRCS=	if_vx.c if_vx_pci.c
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	if_vx_eisa.c
 .endif
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h eisa_if.h
+SRCS+=	device_if.h bus_if.h pci_if.h eisa_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index e53d986..2f32cd3 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_wb
-SRCS=	if_wb.c opt_bdg.h device_if.h
+SRCS=	if_wb.c device_if.h
 SRCS+=	bus_if.h miibus_if.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index 3c2c162..637da41 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_xl
-SRCS=	if_xl.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS=	if_xl.c device_if.h bus_if.h pci_if.h
 SRCS+=	miibus_if.h
 
 .include <bsd.kmod.mk>