3 files changed, 23 insertions, 23 deletions

diff --git a/sys/conf/files b/sys/conf/files
index ba608e961649c..4d2e14b417d30 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -817,23 +817,23 @@ i4b/driver/i4b_rbch.c		count i4brbch
 i4b/driver/i4b_tel.c		count i4btel
 i4b/driver/i4b_ipr.c		count i4bipr
 net/slcompress.c		optional i4bipr
-i4b/driver/i4b_ctl.c		count i4bctl
+i4b/driver/i4b_ctl.c		optional i4bctl
 i4b/driver/i4b_ing.c		count i4bing
 i4b/driver/i4b_isppp.c		count i4bisppp
 net/slcompress.c		optional i4bisppp
 #
 # isdn4bsd CAPI driver
 #
-i4b/capi/capi_l4if.c		count i4bcapi
+i4b/capi/capi_l4if.c		optional i4bcapi
 i4b/capi/capi_llif.c		optional i4bcapi
 i4b/capi/capi_msgs.c		optional i4bcapi
 #
 # isdn4bsd AVM B1/T1 CAPI driver
 #
-i4b/capi/iavc/iavc_pci.c	count iavc pci
-i4b/capi/iavc/iavc_isa.c	optional iavc
-i4b/capi/iavc/iavc_lli.c	optional iavc
-i4b/capi/iavc/iavc_card.c	optional iavc
+i4b/capi/iavc/iavc_pci.c	optional iavc i4bcapi pci
+i4b/capi/iavc/iavc_isa.c	optional iavc i4bcapi isa
+i4b/capi/iavc/iavc_lli.c	optional iavc i4bcapi
+i4b/capi/iavc/iavc_card.c	optional iavc i4bcapi
 #
 # isdn4bsd support
 #
@@ -841,7 +841,7 @@ i4b/layer2/i4b_mbuf.c		optional i4btrc
 #
 # isdn4bsd Q.921 handler
 #
-i4b/layer2/i4b_l2.c		count i4bq921
+i4b/layer2/i4b_l2.c		optional i4bq921
 i4b/layer2/i4b_l2fsm.c		optional i4bq921
 i4b/layer2/i4b_uframe.c		optional i4bq921
 i4b/layer2/i4b_tei.c		optional i4bq921
@@ -853,7 +853,7 @@ i4b/layer2/i4b_lme.c		optional i4bq921
 #
 # isdn4bsd Q.931 handler
 #
-i4b/layer3/i4b_q931.c		count i4bq931
+i4b/layer3/i4b_q931.c		optional i4bq931
 i4b/layer3/i4b_l3fsm.c		optional i4bq931
 i4b/layer3/i4b_l3timer.c	optional i4bq931
 i4b/layer3/i4b_l2if.c		optional i4bq931
@@ -862,7 +862,7 @@ i4b/layer3/i4b_q932fac.c	optional i4bq931
 #
 # isdn4bsd control device driver, interface to isdnd
 #
-i4b/layer4/i4b_i4bdrv.c		count i4b
+i4b/layer4/i4b_i4bdrv.c		optional i4b
 i4b/layer4/i4b_l4.c		optional i4b
 i4b/layer4/i4b_l4mgmt.c		optional i4b
 i4b/layer4/i4b_l4timer.c	optional i4b
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 64457159612a4..9148b832371b8 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -332,7 +332,7 @@ i4b/layer1/isic/i4b_elsa_qs1p.c		optional	isic pci
 i4b/layer1/isic/i4b_elsa_pcc16.c	optional	isic
 i4b/layer1/isic/i4b_hscx.c		optional	isic
 i4b/layer1/isic/i4b_isac.c		optional	isic
-i4b/layer1/isic/i4b_isic.c		count		isic
+i4b/layer1/isic/i4b_isic.c		optional	isic
 i4b/layer1/isic/i4b_isic_isa.c		optional	isic
 i4b/layer1/isic/i4b_isic_pnp.c		optional	isic
 i4b/layer1/isic/i4b_itk_ix1.c		optional	isic
@@ -348,7 +348,7 @@ i4b/layer1/isic/i4b_diva.c		optional	isic
 #
 # isdn4bsd, iwic
 #
-i4b/layer1/iwic/i4b_iwic_pci.c		count		iwic pci
+i4b/layer1/iwic/i4b_iwic_pci.c		optional	iwic pci
 i4b/layer1/iwic/i4b_iwic_dchan.c	optional	iwic pci
 i4b/layer1/iwic/i4b_iwic_bchan.c	optional	iwic pci
 i4b/layer1/iwic/i4b_iwic_fsm.c		optional	iwic pci
@@ -356,34 +356,34 @@ i4b/layer1/iwic/i4b_iwic_l1if.c		optional	iwic pci
 #
 # isdn4bsd, ifpi
 #
-i4b/layer1/ifpi/i4b_ifpi_pci.c		count		ifpi pci
+i4b/layer1/ifpi/i4b_ifpi_pci.c		optional	ifpi pci
 i4b/layer1/ifpi/i4b_ifpi_isac.c		optional	ifpi pci
 i4b/layer1/ifpi/i4b_ifpi_l1.c		optional	ifpi pci
 i4b/layer1/ifpi/i4b_ifpi_l1fsm.c	optional	ifpi pci
 #
 # isdn4bsd, ifpi2
 #
-i4b/layer1/ifpi2/i4b_ifpi2_pci.c	count		ifpi2 pci
+i4b/layer1/ifpi2/i4b_ifpi2_pci.c	optional	ifpi2 pci
 i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c	optional	ifpi2 pci
 i4b/layer1/ifpi2/i4b_ifpi2_l1.c		optional	ifpi2 pci
 i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c	optional	ifpi2 pci
 #
 # isdn4bsd, ifpnp
 #
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c	count		ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional	ifpnp
 #
 # isdn4bsd, ihfc
 #
-i4b/layer1/ihfc/i4b_ihfc_l1if.c		count		ihfc
+i4b/layer1/ihfc/i4b_ihfc_l1if.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_pnp.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_drv.c		optional	ihfc
 #
 # isdn4bsd, itjc
 #
-i4b/layer1/itjc/i4b_itjc_pci.c		count		itjc
+i4b/layer1/itjc/i4b_itjc_pci.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_isac.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional	itjc
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index f10f6f7af4f91..1906595e59cf0 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -298,7 +298,7 @@ i4b/layer1/isic/i4b_elsa_qs1p.c		optional	isic pci
 i4b/layer1/isic/i4b_elsa_pcc16.c	optional	isic
 i4b/layer1/isic/i4b_hscx.c		optional	isic
 i4b/layer1/isic/i4b_isac.c		optional	isic
-i4b/layer1/isic/i4b_isic.c		count		isic
+i4b/layer1/isic/i4b_isic.c		optional	isic
 i4b/layer1/isic/i4b_isic_isa.c		optional	isic
 i4b/layer1/isic/i4b_isic_pnp.c		optional	isic
 i4b/layer1/isic/i4b_itk_ix1.c		optional	isic
@@ -314,7 +314,7 @@ i4b/layer1/isic/i4b_diva.c		optional	isic
 #
 # isdn4bsd, iwic
 #
-i4b/layer1/iwic/i4b_iwic_pci.c		count		iwic pci
+i4b/layer1/iwic/i4b_iwic_pci.c		optional	iwic pci
 i4b/layer1/iwic/i4b_iwic_dchan.c	optional	iwic pci
 i4b/layer1/iwic/i4b_iwic_bchan.c	optional	iwic pci
 i4b/layer1/iwic/i4b_iwic_fsm.c		optional	iwic pci
@@ -322,34 +322,34 @@ i4b/layer1/iwic/i4b_iwic_l1if.c		optional	iwic pci
 #
 # isdn4bsd, ifpi
 #
-i4b/layer1/ifpi/i4b_ifpi_pci.c		count		ifpi pci
+i4b/layer1/ifpi/i4b_ifpi_pci.c		optional	ifpi pci
 i4b/layer1/ifpi/i4b_ifpi_isac.c		optional	ifpi pci
 i4b/layer1/ifpi/i4b_ifpi_l1.c		optional	ifpi pci
 i4b/layer1/ifpi/i4b_ifpi_l1fsm.c	optional	ifpi pci
 #
 # isdn4bsd, ifpi2
 #
-i4b/layer1/ifpi2/i4b_ifpi2_pci.c	count		ifpi2 pci
+i4b/layer1/ifpi2/i4b_ifpi2_pci.c	optional	ifpi2 pci
 i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c	optional	ifpi2 pci
 i4b/layer1/ifpi2/i4b_ifpi2_l1.c		optional	ifpi2 pci
 i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c	optional	ifpi2 pci
 #
 # isdn4bsd, ifpnp
 #
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c	count		ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional	ifpnp
 i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional	ifpnp
 #
 # isdn4bsd, ihfc
 #
-i4b/layer1/ihfc/i4b_ihfc_l1if.c		count		ihfc
+i4b/layer1/ihfc/i4b_ihfc_l1if.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_pnp.c		optional	ihfc
 i4b/layer1/ihfc/i4b_ihfc_drv.c		optional	ihfc
 #
 # isdn4bsd, itjc
 #
-i4b/layer1/itjc/i4b_itjc_pci.c		count		itjc
+i4b/layer1/itjc/i4b_itjc_pci.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_isac.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1.c		optional	itjc
 i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional	itjc