Change the name of the installed KLM to contain a leading "if_".

Except for miibus which is now installed as miibus.ko.

Discussed by:	msmith, peter, and wpaul

16 files changed, 25 insertions, 16 deletions

diff --git a/sys/modules/ax/Makefile b/sys/modules/ax/Makefile
index 49c977f..bf18b13 100644
--- a/sys/modules/ax/Makefile
+++ b/sys/modules/ax/Makefile
@@ -2,7 +2,7 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= ax
+KMOD	= if_ax
 SRCS	= if_ax.c ax.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= ax.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
diff --git a/sys/modules/dm/Makefile b/sys/modules/dm/Makefile
index bd96130..f4fac6e 100644
--- a/sys/modules/dm/Makefile
+++ b/sys/modules/dm/Makefile
@@ -2,12 +2,13 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= dm
+KMOD	= if_dm
 SRCS	= if_dm.c dm.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= dm.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
+KMODDEPS = miibus
 
 dm.h:
 	echo "#define NDM 1" > dm.h
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index d54f153..715280d 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -2,7 +2,7 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= fxp
+KMOD	= if_fxp
 SRCS	= if_fxp.c fxp.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= fxp.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 507f61d..4949f25 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -2,7 +2,7 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/dev/mii
-KMOD	= mii
+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
diff --git a/sys/modules/mx/Makefile b/sys/modules/mx/Makefile
index cad21d2..0e745d1 100644
--- a/sys/modules/mx/Makefile
+++ b/sys/modules/mx/Makefile
@@ -2,7 +2,7 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= mx
+KMOD	= if_mx
 SRCS	= if_mx.c mx.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= mx.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
diff --git a/sys/modules/pn/Makefile b/sys/modules/pn/Makefile
index dc567a6..02e5291 100644
--- a/sys/modules/pn/Makefile
+++ b/sys/modules/pn/Makefile
@@ -2,7 +2,7 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= pn
+KMOD	= if_pn
 SRCS	= if_pn.c pn.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= pn.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index a7c836b..0ea1813 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -2,11 +2,12 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= rl
+KMOD	= if_rl
 SRCS	= if_rl.c rl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= rl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
+KMODDEPS = miibus
 
 CFLAGS	+= ${DEBUG_FLAGS}
 
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index a58a2c8..b58ed5b 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -2,11 +2,12 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= sf
+KMOD	= if_sf
 SRCS	= if_sf.c sf.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= sf.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
+KMODDEPS = miibus
 
 CFLAGS	+= ${DEBUG_FLAGS}
 
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index 50d8c3f..3757203 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -2,12 +2,13 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= sis
+KMOD	= if_sis
 SRCS	= if_sis.c sis.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= sis.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
+KMODDEPS = miibus
 
 sis.h:
 	echo "#define NSIS 1" > sis.h
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index da9f507..b45da92 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -2,7 +2,7 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= sk
+KMOD	= if_sk
 SRCS	= if_sk.c sk.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= sk.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index d078a43..3ed85a2 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -2,12 +2,13 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= ste
+KMOD	= if_ste
 SRCS	= if_ste.c ste.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= ste.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
+KMODDEPS = miibus
 
 ste.h:
 	echo "#define NSTE 1" > ste.h
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 6f4844d..44efe9f 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -2,7 +2,7 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= ti
+KMOD	= if_ti
 SRCS	= if_ti.c ti.h bpf.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= ti.h bpf.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index e1f0339..2ae6f89 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -2,12 +2,13 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= tl
+KMOD	= if_tl
 SRCS	= if_tl.c tl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= tl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILEs	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
+KMODDEPS = miibus
 
 tl.h:
 	echo "#define NTL 1" > tl.h
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index 2995665..0d81501 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -2,11 +2,12 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= vr
+KMOD	= if_vr
 SRCS	= if_vr.c vr.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= vr.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
+KMODDEPS = miibus
 
 CFLAGS	+= ${DEBUG_FLAGS}
 
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index b81758e..2a07c3e 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -2,12 +2,13 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= wb
+KMOD	= if_wb
 SRCS	= if_wb.c wb.h bpf.h opt_bdg.h device_if.h
 SRCS	+= bus_if.h miibus_if.h pci_if.h
 CLEANFILES	+= wb.h bpf.h opt_bdg.h device_if.h
 CLEANFILES	+= bus_if.h miibus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
+KMODDEPS = miibus
 
 wb.h:
 	echo "#define NWB 1" > wb.h
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index 35b7f07..e33d36d 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -2,12 +2,13 @@
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
-KMOD	= xl
+KMOD	= if_xl
 SRCS	= if_xl.c xl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
 CLEANFILES	+= xl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
+KMODDEPS = miibus
 
 xl.h:
 	echo "#define NXL 1" > xl.h