7 files changed, 6 insertions, 40 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index bc97db650b1f8..e6cd0cf879b08 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -2,9 +2,9 @@
 
 # XXX present but broken: atapi ip_mroute_mod joy pcic
 
-SUBDIR=	aha al ax ccd cd9660 coda dm fdesc fxp if_disc if_ppp if_sl if_tun \
-	ipfilter ipfw kernfs md mfs mii msdos mx netgraph nfs ntfs nullfs \
-	pn portal procfs rl sf sis sk ste ti tl umapfs union vn vr wb xl
+SUBDIR=	aha ccd dc cd9660 coda fdesc fxp if_disc if_ppp if_sl if_tun \
+	ipfilter ipfw kernfs md mfs mii msdos netgraph nfs ntfs nullfs \
+	portal procfs rl sf sis sk ste ti tl umapfs union vn vr wb xl
 
 SUBDIR+=usb ugen uhid ukbd ulpt ums umodem umass
 
diff --git a/sys/modules/ax/Makefile b/sys/modules/ax/Makefile
deleted file mode 100644
index 3368a7fc57bf7..0000000000000
--- a/sys/modules/ax/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../pci
-KMOD	= if_ax
-SRCS	= if_ax.c opt_bdg.h device_if.h bus_if.h pci_if.h
-CFLAGS	+= ${DEBUG_FLAGS}
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/al/Makefile b/sys/modules/dc/Makefile
index 58170cfe53571..2f87272456477 100644
--- a/sys/modules/al/Makefile
+++ b/sys/modules/dc/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../../pci
-KMOD	= al
-SRCS	= if_al.c opt_bdg.h device_if.h bus_if.h pci_if.h
+KMOD	= if_dc
+SRCS	= if_dc.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
diff --git a/sys/modules/dm/Makefile b/sys/modules/dm/Makefile
deleted file mode 100644
index e0e19baad12a6..0000000000000
--- a/sys/modules/dm/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../pci
-KMOD	= if_dm
-SRCS	= if_dm.c opt_bdg.h device_if.h bus_if.h pci_if.h
-SRCS	+= miibus_if.h
-CFLAGS	+= ${DEBUG_FLAGS}
-KMODDEPS = miibus
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 72eb7187fd327..407f3c3a68101 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -4,7 +4,7 @@
 KMOD	= miibus
 SRCS	= mii.c mii_physubr.c ukphy.c ukphy_subr.c bus_if.h
 SRCS	+= miibus_if.h device_if.h miibus_if.c exphy.c nsphy.c
-SRCS	+= mlphy.c tlphy.c rlphy.c amphy.c mxphy.c
+SRCS	+= mlphy.c tlphy.c rlphy.c amphy.c dcphy.c pnphy.c
 CFLAGS	+= ${DEBUG_FLAGS}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/mx/Makefile b/sys/modules/mx/Makefile
deleted file mode 100644
index bbb49c0c34b13..0000000000000
--- a/sys/modules/mx/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../pci
-KMOD	= if_mx
-SRCS	= if_mx.c opt_bdg.h device_if.h bus_if.h pci_if.h miibus_if.h
-CFLAGS	+= ${DEBUG_FLAGS}
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/pn/Makefile b/sys/modules/pn/Makefile
deleted file mode 100644
index 51909c010030a..0000000000000
--- a/sys/modules/pn/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../pci
-KMOD	= if_pn
-SRCS	= if_pn.c opt_bdg.h device_if.h bus_if.h pci_if.h
-CFLAGS	+= ${DEBUG_FLAGS}
-
-.include <bsd.kmod.mk>