Move to generating pccarddevs.h on the fly, both for the kernel and

the modules. Also generate usbdevs.h automatically now, but a non-kernel file is stopping that at the moment.
svn path=/head/; revision=129740
2004-05-26 00:53:10 +00:00 · 2004-05-26 00:53:10 +00:00 · dba6dd177b · 2020-12-20 02:59:44 +00:00
commit dba6dd177b
parent 79af3d91df
50 changed files with 66 additions and 1231 deletions
--- a/sys/conf/files
+++ b/sys/conf/files
@ -40,6 +40,16 @@ miidevs.h			standard				   \
 	compile-with	"${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
 	no-obj no-implicit-rule						   \
 	clean		"miidevs.h"
+pccarddevs.h			standard				   \
+	dependency	"$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
+	compile-with	"${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
+	no-obj no-implicit-rule						   \
+	clean		"pccarddevs.h"
+usbdevs.h			standard				   \
+	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
+	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
+	no-obj no-implicit-rule						   \
+	clean		"usbdevs.h"
 kern/device_if.m		standard
 kern/bus_if.m			standard
 kern/clock_if.m			optional genclock
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@ -326,16 +326,18 @@ vnode_if.${_ext}: @/tools/vnode_if.awk @/kern/vnode_if.src
 .endif
 .endfor

-.if ${SRCS:Mmiidevs.h} != ""
-CLEANFILES+=	miidevs.h
+.for _i in mii pccard usb
+.if ${SRCS:M${_i}devs.h} != ""
+CLEANFILES+=	${_i}devs.h
 .if !exists(@)
-miidevs.h: @
+${_i}devs.h: @
 .endif
 .if exists(@)
-miidevs.h: @/tools/miidevs2h.awk @/dev/mii/miidevs
+${_i}devs.h: @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs
 .endif
-	${AWK} -f @/tools/miidevs2h.awk @/dev/mii/miidevs
+	${AWK} -f @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs
 .endif
+.endfor # _i

 regress:

--- a/sys/dev/aic/aic_pccard.c
+++ b/sys/dev/aic/aic_pccard.c
@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/aic/aicvar.h>
 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 #include "card_if.h"

--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>

 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include "card_if.h"

 #include <dev/an/if_aironet_ieee.h>
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <dev/ata/ata-all.h>
 #include <dev/pccard/pccard_cis.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>

--- a/sys/dev/awi/if_awi_pccard.c
+++ b/sys/dev/awi/if_awi_pccard.c
@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/awi/awivar.h>

 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include "card_if.h"

 struct awi_pccard_softc {
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/cs/if_csvar.h>
 #include <dev/cs/if_csreg.h>
 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 #include "card_if.h"

--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@ -51,7 +51,7 @@
 #include <dev/ed/if_edreg.h>
 #include <dev/ed/if_edvar.h>
 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #ifndef ED_NO_MIIBUS
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ep/if_epvar.h>

 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 #include "card_if.h"

--- a/sys/dev/ex/if_ex_pccard.c
+++ b/sys/dev/ex/if_ex_pccard.c
@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ex/if_exvar.h>

 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 static const struct pccard_product ex_pccard_products[] = {
 	PCMCIA_CARD(OLICOM, OC2220, 0),
--- a/sys/dev/fe/if_fe_pccard.c
+++ b/sys/dev/fe/if_fe_pccard.c
@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/fe/if_fevar.h>

 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include "card_if.h"
 #include <pccard/cardinfo.h>

--- a/sys/dev/joy/joy_pccard.c
+++ b/sys/dev/joy/joy_pccard.c
@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");

 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 static int
 joy_pccard_match(device_t dev)
--- a/sys/dev/ncv/ncr53c500_pccard.c
+++ b/sys/dev/ncv/ncr53c500_pccard.c
@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");

 #include <sys/device_port.h>

-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccardvar.h>

 #include <cam/scsi/scsi_low.h>
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");

 #include <sys/device_port.h>

-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccardvar.h>

 #include <cam/scsi/scsi_low.h>
--- a/sys/dev/owi/if_owi_pccard.c
+++ b/sys/dev/owi/if_owi_pccard.c
@ -60,7 +60,7 @@
 #include <dev/owi/if_ieee80211.h>

 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 #include <dev/wi/if_wavelan_ieee.h>
 #include <dev/owi/if_wivar.h>
--- a/sys/dev/pccard/pccard_cis_quirks.c
+++ b/sys/dev/pccard/pccard_cis_quirks.c
@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <machine/resource.h>

-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>
 #include <dev/pccard/pccard_cis.h>
--- a/sys/dev/pccard/pccarddevs.h
+++ b/sys/dev/pccard/pccarddevs.h
--- a/sys/dev/sio/sio_pccard.c
+++ b/sys/dev/sio/sio_pccard.c
@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/timepps.h>

 #include <dev/pccard/pccard_cis.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>

--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");

 #include <dev/sn/if_snvar.h>
 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 #include "card_if.h"

--- a/sys/dev/stg/tmc18c30_pccard.c
+++ b/sys/dev/stg/tmc18c30_pccard.c
@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");

 #include <sys/device_port.h>

-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccardvar.h>

 #include <cam/scsi/scsi_low.h>
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>

 #include <dev/pccard/pccard_cis.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>

--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");

 #include <dev/pccard/pccardvar.h>
 #if __FreeBSD_version >= 500000
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #endif

 #include <dev/wi/if_wavelan_ieee.h>
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/xe/if_xevar.h>

 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"
 #include <dev/pccard/pccard_cis.h>
 #include "card_if.h"

--- 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"
--- 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
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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

--- 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}
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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}
--- 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>
--- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
+++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
@ -59,7 +59,7 @@

 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>
-#include <dev/pccard/pccarddevs.h>
+#include "pccarddevs.h"

 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>