26 files changed, 28 insertions, 25 deletions

diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile
index 60df81a265c9..860d9a8a9499 100644
--- a/sys/modules/aic/Makefile
+++ b/sys/modules/aic/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	aic
 SRCS=	aic.c aic_pccard.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.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
 
 .if ${MACHINE} == "pc98"
diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile
index 74fd203f88f0..c2c66d5fa700 100644
--- a/sys/modules/an/Makefile
+++ b/sys/modules/an/Makefile
@@ -5,6 +5,7 @@
 KMOD=	if_an
 SRCS=	if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
 SRCS+=	opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
+SRCS+=	pccarddevs.h
 
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
diff --git a/sys/modules/awi/Makefile b/sys/modules/awi/Makefile
index b0e743b7ee44..554ffe5c01ab 100644
--- a/sys/modules/awi/Makefile
+++ b/sys/modules/awi/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	if_awi
 SRCS=	am79c930.c awi.c if_awi_pccard.c
-SRCS+=	bus_if.h card_if.h device_if.h opt_inet.h
+SRCS+=	bus_if.h card_if.h device_if.h opt_inet.h pccarddevs.h
 
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
diff --git a/sys/modules/cs/Makefile b/sys/modules/cs/Makefile
index 579a86072f21..49f7e1169568 100644
--- a/sys/modules/cs/Makefile
+++ b/sys/modules/cs/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	if_cs
 SRCS=	if_cs.c if_cs_pccard.c if_cs_isa.c
-SRCS+=	bus_if.h card_if.h device_if.h isa_if.h
+SRCS+=	bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile
index ea8ac04e08f8..dda16edcd34a 100644
--- a/sys/modules/ed/Makefile
+++ b/sys/modules/ed/Makefile
@@ -12,6 +12,6 @@ SRCS+=	if_ed_isa.c
 .endif
 
 SRCS+=	opt_ed.h opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h \
-	miibus_if.h
+	miibus_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index 71fdcc226936..9d3293214a81 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -7,6 +7,6 @@ SRCS=	if_ep.c if_ep_pccard.c
 SRCS+=	if_ep_isa.c
 #SRCS+=	if_ep_eisa.c
 #SRCS+=	if_ep_mca.c
-SRCS+=	opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
+SRCS+=	opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ex/Makefile b/sys/modules/ex/Makefile
index 34f0f13b57ac..5c394aa5e11f 100644
--- a/sys/modules/ex/Makefile
+++ b/sys/modules/ex/Makefile
@@ -7,6 +7,6 @@ KMOD=	if_ex
 SRCS=	if_ex.c \
 	if_ex_isa.c isa_if.h \
 	if_ex_pccard.c card_if.h \
-	bus_if.h device_if.h
+	bus_if.h device_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/exca/Makefile b/sys/modules/exca/Makefile
index d5766117c2eb..b7a8d522b283 100644
--- a/sys/modules/exca/Makefile
+++ b/sys/modules/exca/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/exca
 
 KMOD=	exca
-SRCS=	exca.c device_if.h bus_if.h power_if.h card_if.h
+SRCS=	exca.c device_if.h bus_if.h power_if.h card_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index b3751f7460b9..263514873144 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -13,7 +13,7 @@ SRCS=	fd.c
 SRCS=	fdc.c
 .endif
 SRCS+=	opt_fdc.h card.h \
-	bus_if.h card_if.h device_if.h isa_if.h
+	bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
 
 FDC_DEBUG?=	0	# 0/1
 FDC_PCCARD?=	1	# 0/1  whether pccard support (i. e. Y-E DATA PCMCIA
diff --git a/sys/modules/fe/Makefile b/sys/modules/fe/Makefile
index bbebe86144c7..77af85bfd63b 100644
--- a/sys/modules/fe/Makefile
+++ b/sys/modules/fe/Makefile
@@ -11,6 +11,6 @@ SRCS+=	if_fe_cbus.c
 SRCS+=	if_fe_isa.c
 .endif
 
-SRCS+=	bus_if.h card_if.h device_if.h isa_if.h
+SRCS+=	bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile
index 47c3bb145aa6..bce7c969da24 100644
--- a/sys/modules/if_ndis/Makefile
+++ b/sys/modules/if_ndis/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	if_ndis
 SRCS=	if_ndis.c if_ndis_pci.c if_ndis_pccard.c
-SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h
+SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 042db89cc6eb..71ba7f14692d 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -3,6 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/joy
 
 KMOD=	joy
-SRCS=	bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c
+SRCS=	bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c \
+	pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ncv/Makefile b/sys/modules/ncv/Makefile
index 9d6e84251f3b..b1a273aae520 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
+SRCS+=	opt_bdg.h 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/netgraph/bluetooth/bt3c/Makefile b/sys/modules/netgraph/bluetooth/bt3c/Makefile
index 8cb8550d4775..753400eddda5 100644
--- a/sys/modules/netgraph/bluetooth/bt3c/Makefile
+++ b/sys/modules/netgraph/bluetooth/bt3c/Makefile
@@ -7,7 +7,7 @@ CFLAGS+=	-I${.CURDIR}/../../../../netgraph/bluetooth/include \
 		-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
 
 KMOD=		ng_bt3c
-SRCS=		ng_bt3c_pccard.c bus_if.h card_if.h device_if.h
+SRCS=		ng_bt3c_pccard.c bus_if.h card_if.h device_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
 
diff --git a/sys/modules/nsp/Makefile b/sys/modules/nsp/Makefile
index 5c69310fdfb7..3cdc7051079f 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
+SRCS+=	opt_bdg.h 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/oldcard/Makefile b/sys/modules/oldcard/Makefile
index 8a94ab669d50..cbe92d776702 100644
--- a/sys/modules/oldcard/Makefile
+++ b/sys/modules/oldcard/Makefile
@@ -5,7 +5,7 @@
 KMOD=	oldcard
 SRCS=	pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_pci.c pcic_isa.c \
 	opt_pcic.h device_if.h bus_if.h isa_if.h pci_if.h \
-	power_if.h card_if.h 
+	power_if.h card_if.h pccarddevs.h
 
 EXPORT_SYMS=	YES	# XXX evaluate
 
diff --git a/sys/modules/owi/Makefile b/sys/modules/owi/Makefile
index 3ffb1b0bd073..85f5c7182d37 100644
--- a/sys/modules/owi/Makefile
+++ b/sys/modules/owi/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	if_owi
 SRCS=	opt_wi.h if_owi.c if_owi_pccard.c \
-	card_if.h device_if.h bus_if.h pci_if.h
+	card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h
 
 opt_wi.h:
 	touch ${.TARGET}
diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile
index e1cd70a670b0..f77bc571aa78 100644
--- a/sys/modules/pccard/Makefile
+++ b/sys/modules/pccard/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	pccard
 SRCS=	pccard.c pccard_cis.c pccard_cis_quirks.c \
-	device_if.h bus_if.h card_if.h power_if.h
+	device_if.h bus_if.h card_if.h power_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile
index d0ab81776fbf..00b0643decbe 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	pcic
 SRCS=	i82365.c i82365_isa.c device_if.h bus_if.h isa_if.h \
-	power_if.h card_if.h power_if.c card_if.c
+	power_if.h card_if.h power_if.c card_if.c pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ray/Makefile b/sys/modules/ray/Makefile
index 2d9f5fca3579..84eb9d958568 100644
--- a/sys/modules/ray/Makefile
+++ b/sys/modules/ray/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	if_ray
 SRCS=	if_ray.c
-SRCS+=	device_if.h bus_if.h card_if.h opt_inet.h
+SRCS+=	device_if.h bus_if.h card_if.h opt_inet.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sio/Makefile b/sys/modules/sio/Makefile
index 1e948a30d526..74235635a795 100644
--- a/sys/modules/sio/Makefile
+++ b/sys/modules/sio/Makefile
@@ -8,7 +8,7 @@
 KMOD=	sio
 SRCS=	bus_if.h card_if.h device_if.h isa_if.h pci_if.h \
 	opt_comconsole.h opt_compat.h opt_ddb.h opt_sio.h \
-	sio.c sio_pccard.c sio_pci.c sio_puc.c
+	sio.c sio_pccard.c sio_pci.c sio_puc.c pccarddevs.h
 .if ${MACHINE} == "pc98"
 SRCS+=	sio_cbus.c
 .else
diff --git a/sys/modules/sn/Makefile b/sys/modules/sn/Makefile
index b443ab2278f0..b248c757643c 100644
--- a/sys/modules/sn/Makefile
+++ b/sys/modules/sn/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	if_sn
 SRCS=	if_sn.c if_sn_isa.c if_sn_pccard.c device_if.h bus_if.h isa_if.h \
-	card_if.h
+	card_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/stg/Makefile b/sys/modules/stg/Makefile
index d4797777d345..83362d3e9a35 100644
--- a/sys/modules/stg/Makefile
+++ b/sys/modules/stg/Makefile
@@ -5,7 +5,7 @@
 KMOD=	stg
 SRCS=	tmc18c30.c tmc18c30_subr.c \
 	tmc18c30_isa.c		isa_if.h \
-	tmc18c30_pccard.c	card_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+=	opt_cam.h opt_scsi.h opt_ddb.h
diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile
index 4de0e9aeb48e..e03e0ec8b01e 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -11,6 +11,7 @@ SRCS=	uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
 	uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \
 	uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \
 	uart_dev_z8530.c uart_if.c uart_subr.c uart_tty.c
-SRCS+=	bus_if.h device_if.h isa_if.h pci_if.h uart_if.h power_if.h card_if.h
+SRCS+=	bus_if.h device_if.h isa_if.h pci_if.h uart_if.h power_if.h card_if.h \
+	pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wi/Makefile b/sys/modules/wi/Makefile
index 75e1d697a561..ee577e8bd4ac 100644
--- a/sys/modules/wi/Makefile
+++ b/sys/modules/wi/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	if_wi
 SRCS=	opt_wi.h if_wi.c if_wi_pccard.c if_wi_pci.c \
-	card_if.h device_if.h bus_if.h pci_if.h
+	card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h
 
 opt_wi.h:
 	echo "#define WI_SYMBOL_FIRMWARE 1" > ${.TARGET}
diff --git a/sys/modules/xe/Makefile b/sys/modules/xe/Makefile
index 4568fb74d8a8..f900854352b4 100644
--- a/sys/modules/xe/Makefile
+++ b/sys/modules/xe/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	if_xe
 SRCS=	if_xe.c if_xe_pccard.c
-SRCS+=	bus_if.h card_if.h device_if.h
+SRCS+=	bus_if.h card_if.h device_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>