Delete the 'device-driver' suffix. It's been meaningless for a long time.

On the VAX, it used to be used for special compilation to avoid the
optimizer which would mess with memory mapped devices etc.  These days
we use 'volatile'.

6 files changed, 403 insertions, 415 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 0565542..d6d3c1a 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.27 1999/06/28 09:18:44 peter Exp $
+#	$Id: Makefile.alpha,v 1.28 1999/07/02 04:16:57 mjacob Exp $
 #
 # Makefile for FreeBSD
 #
@@ -57,9 +57,6 @@ NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
-DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
-DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
-DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
 NORMAL_M= ${NORMAL_C}
@@ -221,7 +218,6 @@ __reml.S: ${S}/alpha/alpha/divrem.m4
 
 ${OBJS}: opt_global.h
 
-# XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index b889f7d..66873d0 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.156 1999/06/28 09:21:35 peter Exp $
+#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
 #
 # Makefile for FreeBSD
 #
@@ -70,9 +70,6 @@ PROF+=	-mprofiler-epilogue
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
-DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
-DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
-DRIVER_S= ${CC} -c -x ${ASM_CFLAGS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} $<
 
 GEN_CFILES= ${I386}/i386/genassym.c
@@ -200,7 +197,6 @@ genassym: genassym.o
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
-# XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES}
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index b889f7d..66873d0 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.156 1999/06/28 09:21:35 peter Exp $
+#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
 #
 # Makefile for FreeBSD
 #
@@ -70,9 +70,6 @@ PROF+=	-mprofiler-epilogue
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
-DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
-DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
-DRIVER_S= ${CC} -c -x ${ASM_CFLAGS} $<
 PROFILE_C= ${CC} -c ${CFLAGS} $<
 
 GEN_CFILES= ${I386}/i386/genassym.c
@@ -200,7 +197,6 @@ genassym: genassym.o
 
 ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 
-# XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES}
diff --git a/sys/conf/files b/sys/conf/files
index 0e00de6..f9fc9bc 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3,12 +3,12 @@
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-aicasm				optional	ahc	device-driver	   \
+aicasm				optional	ahc			   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
 	compile-with	"${MAKE} -f $S/dev/aic7xxx/Makefile MAKESRCPATH=$S/dev/aic7xxx" \
 	no-obj no-implicit-rule						   \
 	clean		"aicasm aicasm_gram.c aicasm_scan.c y.tab.h"
-aic7xxx_{seq,reg}.h		optional	ahc	device-driver	   \
+aic7xxx_{seq,reg}.h		optional	ahc			   \
 	compile-with	"./aicasm ${INCLUDES} -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq"   \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"aic7xxx_seq.h aic7xxx_reg.h"			   \
@@ -34,7 +34,7 @@ bus_if.c			standard				\
 	compile-with	"perl5 $S/kern/makedevops.pl -c $S/kern/bus_if.m"	\
 	no-obj no-implicit-rule before-depend local			\
 	clean		"bus_if.c"
-bus_if.h			standard				\ 
+bus_if.h			standard				\
 	dependency	"$S/kern/makedevops.pl $S/kern/bus_if.m"	\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/kern/bus_if.m"	\
 	no-obj no-implicit-rule before-depend				\
@@ -80,51 +80,51 @@ ddb/db_trap.c		optional ddb
 ddb/db_variables.c	optional ddb
 ddb/db_watch.c		optional ddb
 ddb/db_write_cmd.c	optional ddb
-dev/advansys/advansys.c	optional adv device-driver
-dev/advansys/advlib.c	optional adv device-driver
-dev/advansys/advmcode.c	optional adv device-driver
-dev/advansys/adwcam.c	optional adw device-driver
-dev/advansys/adwlib.c	optional adw device-driver
-dev/advansys/adwmcode.c	optional adw device-driver
-dev/aha/aha.c		optional aha device-driver
-dev/aic7xxx/aic7xxx.c	optional ahc device-driver		\
+dev/advansys/advansys.c	optional adv
+dev/advansys/advlib.c	optional adv
+dev/advansys/advmcode.c	optional adv
+dev/advansys/adwcam.c	optional adw
+dev/advansys/adwlib.c	optional adw
+dev/advansys/adwmcode.c	optional adw
+dev/aha/aha.c		optional aha
+dev/aic7xxx/aic7xxx.c	optional ahc		\
 	dependency	"aic7xxx_{reg,seq}.h"
-dev/aic7xxx/93cx6.c	optional ahc device-driver
-dev/buslogic/bt.c	optional bt  device-driver
-dev/ccd/ccd.c		optional ccd device-driver
-#dev/dpt/dpt_control.c	optional dpt device-driver
-dev/dpt/dpt_scsi.c	optional dpt device-driver
-dev/en/midway.c		optional en device-driver
-dev/hea/eni.c		optional hea device-driver
-dev/hea/eni_buffer.c	optional hea device-driver
-dev/hea/eni_globals.c	optional hea device-driver
-dev/hea/eni_if.c	optional hea device-driver
-dev/hea/eni_init.c	optional hea device-driver
-dev/hea/eni_intr.c	optional hea device-driver
-dev/hea/eni_receive.c	optional hea device-driver
-dev/hea/eni_transmit.c	optional hea device-driver
-dev/hea/eni_vcm.c	optional hea device-driver
-dev/hfa/fore_buffer.c	optional hfa device-driver
-dev/hfa/fore_command.c	optional hfa device-driver
-dev/hfa/fore_globals.c	optional hfa device-driver
-dev/hfa/fore_if.c	optional hfa device-driver
-dev/hfa/fore_init.c	optional hfa device-driver
-dev/hfa/fore_intr.c	optional hfa device-driver
-dev/hfa/fore_load.c	optional hfa device-driver
-dev/hfa/fore_output.c	optional hfa device-driver
-dev/hfa/fore_receive.c	optional hfa device-driver
-dev/hfa/fore_stats.c	optional hfa device-driver
-dev/hfa/fore_timer.c	optional hfa device-driver
-dev/hfa/fore_transmit.c	optional hfa device-driver
-dev/hfa/fore_vcm.c	optional hfa device-driver
-dev/ida/ida.c		optional ida device-driver
+dev/aic7xxx/93cx6.c	optional ahc
+dev/buslogic/bt.c	optional bt
+dev/ccd/ccd.c		optional ccd
+#dev/dpt/dpt_control.c	optional dpt
+dev/dpt/dpt_scsi.c	optional dpt
+dev/en/midway.c		optional en
+dev/hea/eni.c		optional hea
+dev/hea/eni_buffer.c	optional hea
+dev/hea/eni_globals.c	optional hea
+dev/hea/eni_if.c	optional hea
+dev/hea/eni_init.c	optional hea
+dev/hea/eni_intr.c	optional hea
+dev/hea/eni_receive.c	optional hea
+dev/hea/eni_transmit.c	optional hea
+dev/hea/eni_vcm.c	optional hea
+dev/hfa/fore_buffer.c	optional hfa
+dev/hfa/fore_command.c	optional hfa
+dev/hfa/fore_globals.c	optional hfa
+dev/hfa/fore_if.c	optional hfa
+dev/hfa/fore_init.c	optional hfa
+dev/hfa/fore_intr.c	optional hfa
+dev/hfa/fore_load.c	optional hfa
+dev/hfa/fore_output.c	optional hfa
+dev/hfa/fore_receive.c	optional hfa
+dev/hfa/fore_stats.c	optional hfa
+dev/hfa/fore_timer.c	optional hfa
+dev/hfa/fore_transmit.c	optional hfa
+dev/hfa/fore_vcm.c	optional hfa
+dev/ida/ida.c		optional ida
 dev/ida/ida_disk.c	optional id
-dev/isp/isp_freebsd.c	optional isp device-driver
-dev/isp/isp.c		optional isp device-driver
-dev/pdq/pdq.c		optional fea device-driver
-dev/pdq/pdq_ifsubr.c	optional fea device-driver
-dev/pdq/pdq.c		optional fpa device-driver
-dev/pdq/pdq_ifsubr.c	optional fpa device-driver
+dev/isp/isp_freebsd.c	optional isp
+dev/isp/isp.c		optional isp
+dev/pdq/pdq.c		optional fea
+dev/pdq/pdq_ifsubr.c	optional fea
+dev/pdq/pdq.c		optional fpa
+dev/pdq/pdq_ifsubr.c	optional fpa
 dev/ppbus/immio.c	optional vpo
 dev/ppbus/if_plip.c	optional plip
 dev/ppbus/lpbb.c	optional lpbb
@@ -141,12 +141,12 @@ smbus_if.o		optional smbus					\
 	dependency	"smbus_if.c smbus_if.h"				\
 	compile-with	"${NORMAL_C}"					\
 	no-implicit-rule local
-smbus_if.c		optional smbus					\ 
+smbus_if.c		optional smbus					\
 	dependency	"$S/kern/makedevops.pl $S/dev/smbus/smbus_if.m" \
 	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/smbus/smbus_if.m" \
 	no-obj no-implicit-rule before-depend local			\
 	clean		"smbus_if.c"
-smbus_if.h		optional smbus					\ 
+smbus_if.h		optional smbus					\
 	dependency	"$S/kern/makedevops.pl $S/dev/smbus/smbus_if.m" \
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/smbus/smbus_if.m" \
 	no-obj no-implicit-rule before-depend				\
@@ -159,12 +159,12 @@ iicbb_if.o		optional iicbb					\
 	dependency	"iicbb_if.c"					\
 	compile-with	"${NORMAL_C}"					\
 	no-implicit-rule local
-iicbb_if.c		optional iicbb					\ 
+iicbb_if.c		optional iicbb					\
 	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbb_if.m" \
 	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/iicbus/iicbb_if.m" \
 	no-obj no-implicit-rule before-depend local			\
 	clean		"iicbb_if.c"
-iicbb_if.h		optional iicbb					\ 
+iicbb_if.h		optional iicbb					\
 	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbb_if.m" \
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/iicbus/iicbb_if.m" \
 	no-obj no-implicit-rule before-depend				\
@@ -175,12 +175,12 @@ iicbus_if.o		optional iicbus					\
 	dependency	"iicbus_if.c iicbus_if.h"			\
 	compile-with	"${NORMAL_C}"					\
 	no-implicit-rule local
-iicbus_if.c		optional iicbus					\ 
+iicbus_if.c		optional iicbus					\
 	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbus_if.m" \
 	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/iicbus/iicbus_if.m" \
 	no-obj no-implicit-rule before-depend local			\
 	clean		"iicbus_if.c"
-iicbus_if.h		optional iicbus					\ 
+iicbus_if.h		optional iicbus					\
 	dependency	"$S/kern/makedevops.pl $S/dev/iicbus/iicbus_if.m" \
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/iicbus/iicbus_if.m" \
 	no-obj no-implicit-rule before-depend				\
@@ -189,21 +189,21 @@ dev/iicbus/iiconf.c	optional iicbus
 dev/iicbus/iicbus.c	optional iicbus
 dev/iicbus/if_ic.c	optional ic
 dev/iicbus/iic.c	optional iic
-dev/vinum/vinum.c		optional vinum device-driver
-dev/vinum/vinumconfig.c		optional vinum device-driver
-dev/vinum/vinumdaemon.c		optional vinum device-driver
-dev/vinum/vinuminterrupt.c	optional vinum device-driver
-dev/vinum/vinumio.c		optional vinum device-driver
-dev/vinum/vinumioctl.c		optional vinum device-driver
-dev/vinum/vinumlock.c		optional vinum device-driver
-dev/vinum/vinummemory.c		optional vinum device-driver
-dev/vinum/vinumparser.c		optional vinum device-driver
-dev/vinum/vinumrequest.c	optional vinum device-driver
-dev/vinum/vinumrevive.c		optional vinum device-driver
-dev/vinum/vinumstate.c		optional vinum device-driver
-dev/vinum/vinumutil.c		optional vinum device-driver
+dev/vinum/vinum.c		optional vinum
+dev/vinum/vinumconfig.c		optional vinum
+dev/vinum/vinumdaemon.c		optional vinum
+dev/vinum/vinuminterrupt.c	optional vinum
+dev/vinum/vinumio.c		optional vinum
+dev/vinum/vinumioctl.c		optional vinum
+dev/vinum/vinumlock.c		optional vinum
+dev/vinum/vinummemory.c		optional vinum
+dev/vinum/vinumparser.c		optional vinum
+dev/vinum/vinumrequest.c	optional vinum
+dev/vinum/vinumrevive.c		optional vinum
+dev/vinum/vinumstate.c		optional vinum
+dev/vinum/vinumutil.c		optional vinum
 dev/vn/vn.c			optional vn
-dev/vx/if_vx.c			optional vx  device-driver
+dev/vx/if_vx.c			optional vx
 gnu/ext2fs/ext2_alloc.c		optional ext2fs
 gnu/ext2fs/ext2_balloc.c	optional ext2fs
 gnu/ext2fs/ext2_inode.c		optional ext2fs
@@ -215,19 +215,19 @@ gnu/ext2fs/ext2_subr.c		optional ext2fs
 gnu/ext2fs/ext2_vfsops.c	optional ext2fs
 gnu/ext2fs/ext2_vnops.c		optional ext2fs
 # device drivers
-i4b/driver/i4b_trace.c	 optional i4btrc	device-driver
-i4b/driver/i4b_rbch.c	 optional i4brbch	device-driver
-i4b/driver/i4b_tel.c	 optional i4btel	device-driver
-i4b/driver/i4b_ipr.c	 optional i4bipr	
-i4b/driver/i4b_ctl.c     optional i4bctl        device-driver
-i4b/driver/i4b_isppp.c   optional i4bisppp      device-driver
+i4b/driver/i4b_trace.c	 optional i4btrc
+i4b/driver/i4b_rbch.c	 optional i4brbch
+i4b/driver/i4b_tel.c	 optional i4btel
+i4b/driver/i4b_ipr.c	 optional i4bipr
+i4b/driver/i4b_ctl.c     optional i4bctl
+i4b/driver/i4b_isppp.c   optional i4bisppp
 net/if_spppsubr.c        optional sppp
 # needed by i4bipr
 net/slcompress.c         optional i4bipr
 # tina-dd control driver
-i4b/tina-dd/i4b_tina_dd.c optional tina		device-driver
-# support 
-i4b/layer2/i4b_mbuf.c	 optional i4btrc	device-driver
+i4b/tina-dd/i4b_tina_dd.c optional tina
+# support
+i4b/layer2/i4b_mbuf.c	 optional i4btrc
 # Q.921 handler
 i4b/layer2/i4b_l2.c	 optional i4bq921
 i4b/layer2/i4b_l2fsm.c	 optional i4bq921
@@ -246,10 +246,10 @@ i4b/layer3/i4b_l2if.c	 optional i4bq931
 i4b/layer3/i4b_l4if.c	 optional i4bq931
 i4b/layer3/i4b_q932fac.c optional i4bq931
 # isdn device driver, interface to i4bd
-i4b/layer4/i4b_i4bdrv.c	 optional i4b		device-driver
-i4b/layer4/i4b_l4.c	 optional i4b		device-driver
-i4b/layer4/i4b_l4mgmt.c	 optional i4b		device-driver
-i4b/layer4/i4b_l4timer.c optional i4b		device-driver
+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
 isofs/cd9660/cd9660_bmap.c	optional cd9660
 isofs/cd9660/cd9660_lookup.c	optional cd9660
 isofs/cd9660/cd9660_node.c	optional cd9660
@@ -460,7 +460,7 @@ spans_xdr.h			optional atm_spans atm_core	\
         dependency      "$S/netatm/spans/spans_xdr.x"		\
         compile-with    "rpcgen -h -C $S/netatm/spans/spans_xdr.x > spans_xdr.h" \
         clean           "spans_xdr.h"				\
-        no-obj no-implicit-rule 
+        no-obj no-implicit-rule
 spans_xdr.c			optional atm_spans atm_core	\
         before-depend						\
         dependency      "$S/netatm/spans/spans_xdr.x"		\
@@ -580,62 +580,62 @@ nfs/bootp_subr.c	optional bootp
 nfs/krpc_subr.c		optional bootp
 pccard/pccard.c		optional card
 pccard/pccard_beep.c	optional card
-pccard/pcic.c		optional pcic device-driver
-pci/amd.c		optional amd device-driver
-pci/pcic_p.c		optional pcic device-driver
-pci/adv_pci.c		optional adv device-driver
-pci/adw_pci.c		optional adw device-driver
-pci/ahc_pci.c		optional ahc device-driver			\
+pccard/pcic.c		optional pcic
+pci/amd.c		optional amd
+pci/pcic_p.c		optional pcic
+pci/adv_pci.c		optional adv
+pci/adw_pci.c		optional adw
+pci/ahc_pci.c		optional ahc 		\
 	dependency	"aic7xxx_reg.h $S/pci/ahc_pci.c"
-pci/brooktree848.c	optional bktr device-driver
-pci/bt848_i2c.c		optional bktr device-driver
-pci/bt_pci.c		optional bt pci device-driver
-pci/cy_pci.c		optional cy device-driver
-pci/dpt_pci.c		optional pci dpt device-driver
-pci/ida_pci.c		optional ida device-driver
-pci/if_al.c		optional al device-driver
-pci/if_ax.c		optional ax device-driver
-pci/if_de.c		optional de device-driver
-pci/if_ed_p.c		optional ed device-driver
-pci/if_en_pci.c		optional en device-driver
-pci/if_fxp.c		optional fxp device-driver
-pci/if_lnc_p.c		optional lnc device-driver
-pci/if_mx.c		optional mx device-driver
-pci/if_pn.c		optional pn device-driver
-pci/if_fpa.c		optional fpa device-driver
-pci/if_rl.c		optional rl device-driver
-pci/if_sr_p.c		optional sr device-driver
-pci/if_ti.c		optional ti device-driver
-pci/if_tl.c		optional tl device-driver
-pci/if_tx.c		optional tx device-driver
-pci/if_vr.c		optional vr device-driver
-pci/if_vx_pci.c		optional vx device-driver
-pci/if_wb.c		optional wb device-driver
-pci/if_xl.c		optional xl device-driver
-pci/isp_pci.c		optional isp device-driver
-pci/intpm.c		optional intpm	device-driver
-pci/meteor.c		optional meteor device-driver
-pci/ncr.c		optional ncr device-driver
-pci/pci.c		optional pci device-driver
+pci/brooktree848.c	optional bktr
+pci/bt848_i2c.c		optional bktr
+pci/bt_pci.c		optional bt pci
+pci/cy_pci.c		optional cy
+pci/dpt_pci.c		optional pci dpt
+pci/ida_pci.c		optional ida
+pci/if_al.c		optional al
+pci/if_ax.c		optional ax
+pci/if_de.c		optional de
+pci/if_ed_p.c		optional ed
+pci/if_en_pci.c		optional en
+pci/if_fxp.c		optional fxp
+pci/if_lnc_p.c		optional lnc
+pci/if_mx.c		optional mx
+pci/if_pn.c		optional pn
+pci/if_fpa.c		optional fpa
+pci/if_rl.c		optional rl
+pci/if_sr_p.c		optional sr
+pci/if_ti.c		optional ti
+pci/if_tl.c		optional tl
+pci/if_tx.c		optional tx
+pci/if_vr.c		optional vr
+pci/if_vx_pci.c		optional vx
+pci/if_wb.c		optional wb
+pci/if_xl.c		optional xl
+pci/isp_pci.c		optional isp
+pci/intpm.c		optional intpm
+pci/meteor.c		optional meteor
+pci/ncr.c		optional ncr
+pci/pci.c		optional pci
 pci/pci_compat.c	optional pci
 pci/pcisupport.c	optional pci
 pci_if.o		optional pci					\
 	dependency	"pci_if.c pci_if.h"				\
 	compile-with	"${NORMAL_C}"					\
 	no-implicit-rule local
-pci_if.c		optional pci					\ 
+pci_if.c		optional pci					\
 	dependency	"$S/kern/makedevops.pl $S/pci/pci_if.m"		\
 	compile-with	"perl5 $S/kern/makedevops.pl -c $S/pci/pci_if.m" \
 	no-obj no-implicit-rule before-depend local			\
 	clean		"pci_if.c"
-pci_if.h		optional pci					\ 
+pci_if.h		optional pci					\
 	dependency	"$S/kern/makedevops.pl $S/pci/pci_if.m"		\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/pci/pci_if.m" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"pci_if.h"
-pci/simos.c		optional simos device-driver
-pci/alpm.c		optional alpm	device-driver
-pci/xrpu.c		optional xrpu device-driver
+pci/simos.c		optional simos
+pci/alpm.c		optional alpm
+pci/xrpu.c		optional xrpu
 posix4/posix4_mib.c	standard
 posix4/p1003_1b.c	standard
 posix4/ksched.c	optional _kposix_priority_scheduling
@@ -683,55 +683,55 @@ vm/vm_swap.c		standard
 vm/vm_unix.c		standard
 vm/vnode_pager.c	standard
 vm/vm_zone.c		standard
-dev/streams/streams.c	optional streams device-driver
+dev/streams/streams.c	optional streams
 #
 # USB support
-pci/uhci_pci.c		optional uhci device-driver
-pci/ohci_pci.c		optional ohci device-driver
-usb_if.o		optional usb device-driver			\
+pci/uhci_pci.c		optional uhci
+pci/ohci_pci.c		optional ohci
+usb_if.o		optional usb					\
 	dependency	"usb_if.c"					\
 	compile-with	"${NORMAL_C}"					\
 	no-implicit-rule local
-usb_if.c		optional usb device-driver			\ 
+usb_if.c		optional usb					\
 	dependency	"$S/kern/makedevops.pl $S/dev/usb/usb_if.m"	\
 	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/usb/usb_if.m"	\
 	no-obj no-implicit-rule before-depend local			\
 	clean		"usb_if.c"
-usb_if.h		optional usb device-driver			\ 
+usb_if.h		optional usb					\
 	dependency	"$S/kern/makedevops.pl $S/dev/usb/usb_if.m"	\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/usb/usb_if.m"	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"usb_if.h"
-dev/usb/uhci.c		optional uhci device-driver
-dev/usb/ohci.c		optional ohci device-driver
-dev/usb/usb.c		optional usb device-driver
-dev/usb/usbdi.c		optional usb device-driver
-dev/usb/usbdi_util.c	optional usb device-driver
-#dev/usb/usb_mem.c	optional usb device-driver
-dev/usb/usb_subr.c	optional usb device-driver
-dev/usb/usb_quirks.c	optional usb device-driver
-dev/usb/hid.c		optional usb device-driver
-dev/usb/ugen.c		optional ugen device-driver
-dev/usb/uhid.c		optional uhid device-driver
-dev/usb/ums.c		optional ums device-driver
-dev/usb/ulpt.c		optional ulpt device-driver
-dev/usb/ukbd.c		optional ukbd device-driver
-dev/usb/umass.c		optional umass device-driver
-dev/usb/uhub.c		optional usb device-driver
+dev/usb/uhci.c		optional uhci
+dev/usb/ohci.c		optional ohci
+dev/usb/usb.c		optional usb
+dev/usb/usbdi.c		optional usb
+dev/usb/usbdi_util.c	optional usb
+#dev/usb/usb_mem.c	optional usb
+dev/usb/usb_subr.c	optional usb
+dev/usb/usb_quirks.c	optional usb
+dev/usb/hid.c		optional usb
+dev/usb/ugen.c		optional ugen
+dev/usb/uhid.c		optional uhid
+dev/usb/ums.c		optional ums
+dev/usb/ulpt.c		optional ulpt
+dev/usb/ukbd.c		optional ukbd
+dev/usb/umass.c		optional umass
+dev/usb/uhub.c		optional usb
 isa_if.o		optional isa					\
 	dependency	"isa_if.c isa_if.h"				\
 	compile-with	"${NORMAL_C}"					\
 	no-implicit-rule local
-isa_if.c		optional isa					\ 
+isa_if.c		optional isa					\
 	dependency	"$S/kern/makedevops.pl $S/isa/isa_if.m"		\
 	compile-with	"perl5 $S/kern/makedevops.pl -c $S/isa/isa_if.m" \
 	no-obj no-implicit-rule before-depend local			\
 	clean		"isa_if.c"
-isa_if.h		optional isa					\ 
+isa_if.h		optional isa					\
 	dependency	"$S/kern/makedevops.pl $S/isa/isa_if.m"		\
 	compile-with	"perl5 $S/kern/makedevops.pl -h $S/isa/isa_if.m" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"isa_if.h"
-isa/isa_common.c	optional isa device-driver
-isa/isahint.c		optional isa device-driver
-isa/bt_isa.c		optional bt isa device-driver
+isa/isa_common.c	optional isa
+isa/isahint.c		optional isa
+isa/bt_isa.c		optional bt isa
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index fb69c9a..6446559 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.21 1999/06/19 13:12:51 dfr Exp $
+#	$Id: files.alpha,v 1.22 1999/06/22 14:13:18 yokota Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -11,14 +11,14 @@
 font8x16.o			optional	std8x16font		\
 	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
 	no-implicit-rule before-depend \
-	clean		"${STD8X16FONT}-8x16 font8x16.c" 
+	clean		"${STD8X16FONT}-8x16 font8x16.c"
 #
 atkbdmap.h			optional	atkbd_dflt_keymap	\
 	compile-with	"kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
-alpha/alpha/autoconf.c		standard	device-driver
+alpha/alpha/autoconf.c		standard
 alpha/alpha/cpuconf.c		standard
 alpha/alpha/atomic.s		standard
 alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
@@ -92,13 +92,13 @@ alpha/tc/tcasic.c		optional	tcasic
 alpha/tc/tc.c			optional	tc
 alpha/tc/ioasic.c		optional	tc
 alpha/tc/mcclock_ioasic.c	optional	tc
-alpha/tc/if_le_ioasic.c		optional	le device-driver
-alpha/tc/if_le_dec.c		optional	le device-driver
-alpha/tc/am7990.c		optional	le device-driver
-alpha/tc/tcds.c			optional	tcds device-driver
-alpha/tc/tcds_dma.c		optional	tcds device-driver
-alpha/tc/esp.c			optional	esp device-driver
-dev/dec/mcclock.c		optional	mcclock device-driver
+alpha/tc/if_le_ioasic.c		optional	le
+alpha/tc/if_le_dec.c		optional	le
+alpha/tc/am7990.c		optional	le
+alpha/tc/tcds.c			optional	tcds
+alpha/tc/tcds_dma.c		optional	tcds
+alpha/tc/esp.c			optional	esp
+dev/dec/mcclock.c		optional	mcclock
 mcclock_if.o			optional	mcclock			\
 	dependency	"mcclock_if.c"					\
 	compile-with	"${NORMAL_C}"					\
@@ -149,32 +149,32 @@ libkern/alpha/htonl.S		standard
 libkern/alpha/htons.S		standard
 libkern/alpha/ntohl.S		standard
 libkern/alpha/ntohs.S		standard
-isa/sio.c			optional	sio device-driver
-dev/fb/fb.c			optional	fb	device-driver
-dev/fb/fb.c			optional	vga	device-driver
-dev/fb/vga.c			optional	vga	device-driver
-isa/vga_isa.c			optional	vga	device-driver
+isa/sio.c			optional	sio
+dev/fb/fb.c			optional	fb
+dev/fb/fb.c			optional	vga
+dev/fb/vga.c			optional	vga
+isa/vga_isa.c			optional	vga
 dev/fb/splash.c			optional	splash
-dev/kbd/atkbd.c			optional	atkbd	device-driver
-isa/atkbd_isa.c			optional	atkbd	device-driver
-dev/kbd/atkbdc.c		optional	atkbdc	device-driver
-isa/atkbdc_isa.c		optional	atkbdc	device-driver
-dev/kbd/kbd.c			optional	atkbd	device-driver
-dev/kbd/kbd.c			optional	kbd	device-driver
-dev/kbd/kbd.c			optional	ukbd	device-driver
-dev/syscons/syscons.c		optional	sc	device-driver
-dev/syscons/schistory.c		optional	sc	device-driver
-dev/syscons/scmouse.c		optional	sc	device-driver
-dev/syscons/scvgarndr.c		optional	sc	device-driver
-dev/syscons/scvidctl.c		optional	sc	device-driver
-dev/syscons/scvtb.c		optional	sc	device-driver
-isa/syscons_isa.c		optional	sc	device-driver
-isa/psm.c			optional	psm	device-driver
-isa/fd.c			optional	fd	device-driver
-dev/ata/ata-all.c		optional	ata	device-driver
-dev/ata/ata-dma.c		optional	ata	device-driver
-dev/ata/atapi-all.c		optional	ata	device-driver
-dev/ata/ata-disk.c		optional	atadisk	device-driver
-dev/ata/atapi-cd.c		optional	atapicd	device-driver
-dev/ata/atapi-fd.c		optional	atapifd	device-driver
-dev/ata/atapi-tape.c		optional	atapist	device-driver
+dev/kbd/atkbd.c			optional	atkbd
+isa/atkbd_isa.c			optional	atkbd
+dev/kbd/atkbdc.c		optional	atkbdc
+isa/atkbdc_isa.c		optional	atkbdc
+dev/kbd/kbd.c			optional	atkbd
+dev/kbd/kbd.c			optional	kbd
+dev/kbd/kbd.c			optional	ukbd
+dev/syscons/syscons.c		optional	sc
+dev/syscons/schistory.c		optional	sc
+dev/syscons/scmouse.c		optional	sc
+dev/syscons/scvgarndr.c		optional	sc
+dev/syscons/scvidctl.c		optional	sc
+dev/syscons/scvtb.c		optional	sc
+isa/syscons_isa.c		optional	sc
+isa/psm.c			optional	psm
+isa/fd.c			optional	fd
+dev/ata/ata-all.c		optional	ata
+dev/ata/ata-dma.c		optional	ata
+dev/ata/atapi-all.c		optional	ata
+dev/ata/ata-disk.c		optional	atadisk
+dev/ata/atapi-cd.c		optional	atapicd
+dev/ata/atapi-fd.c		optional	atapifd
+dev/ata/atapi-tape.c		optional	atapist
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index acea105..48d810f 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.251 1999/07/03 18:26:22 peter Exp $
+#	$Id: files.i386,v 1.252 1999/07/03 18:34:02 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -34,38 +34,38 @@ ukbdmap.h			optional	ukbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 #
-contrib/dev/oltr/if_oltr.c	optional	oltr	device-driver
-trlld.o				optional	oltr	device-driver	\
+contrib/dev/oltr/if_oltr.c	optional	oltr
+trlld.o				optional	oltr			\
 	dependency	"$S/contrib/dev/oltr/i386-${KERNFORMAT}.trlld.o.uu" \
 	compile-with	"uudecode < $S/contrib/dev/oltr/i386-${KERNFORMAT}.trlld.o.uu"	\
 	no-implicit-rule
-contrib/dev/oltr/trlldbm.c	optional	oltr	device-driver
-contrib/dev/oltr/trlldhm.c	optional	oltr	device-driver
-contrib/dev/oltr/trlldmac.c	optional	oltr	device-driver
-dev/ata/ata-all.c		optional	ata	device-driver
-dev/ata/ata-disk.c		optional	atadisk	device-driver
-dev/ata/ata-dma.c		optional	ata	device-driver
-dev/ata/atapi-all.c		optional	ata	device-driver
-dev/ata/atapi-cd.c		optional	atapicd	device-driver
-dev/ata/atapi-fd.c		optional	atapifd	device-driver
-dev/ata/atapi-tape.c		optional	atapist	device-driver
-dev/fb/fb.c			optional	fb	device-driver
-dev/fb/fb.c			optional	vga	device-driver
+contrib/dev/oltr/trlldbm.c	optional	oltr
+contrib/dev/oltr/trlldhm.c	optional	oltr
+contrib/dev/oltr/trlldmac.c	optional	oltr
+dev/ata/ata-all.c		optional	ata
+dev/ata/ata-disk.c		optional	atadisk
+dev/ata/ata-dma.c		optional	ata
+dev/ata/atapi-all.c		optional	ata
+dev/ata/atapi-cd.c		optional	atapicd
+dev/ata/atapi-fd.c		optional	atapifd
+dev/ata/atapi-tape.c		optional	atapist
+dev/fb/fb.c			optional	fb
+dev/fb/fb.c			optional	vga
 dev/fb/splash.c			optional	splash
-dev/fb/vga.c			optional	vga	device-driver
-dev/kbd/atkbd.c			optional	atkbd	device-driver
-dev/kbd/atkbdc.c		optional	atkbdc	device-driver
-dev/kbd/kbd.c			optional	atkbd	device-driver
-dev/kbd/kbd.c			optional	kbd	device-driver
-dev/kbd/kbd.c			optional	ukbd	device-driver
-dev/pccard/if_xe.c		optional	xe	device-driver
-dev/syscons/schistory.c		optional	sc	device-driver
-dev/syscons/scmouse.c		optional	sc	device-driver
-dev/syscons/scvesactl.c		optional	sc	device-driver
-dev/syscons/scvgarndr.c		optional	sc	device-driver
-dev/syscons/scvidctl.c		optional	sc	device-driver
-dev/syscons/scvtb.c		optional	sc	device-driver
-dev/syscons/syscons.c		optional	sc	device-driver
+dev/fb/vga.c			optional	vga
+dev/kbd/atkbd.c			optional	atkbd
+dev/kbd/atkbdc.c		optional	atkbdc
+dev/kbd/kbd.c			optional	atkbd
+dev/kbd/kbd.c			optional	kbd
+dev/kbd/kbd.c			optional	ukbd
+dev/pccard/if_xe.c		optional	xe
+dev/syscons/schistory.c		optional	sc
+dev/syscons/scmouse.c		optional	sc
+dev/syscons/scvesactl.c		optional	sc
+dev/syscons/scvgarndr.c		optional	sc
+dev/syscons/scvidctl.c		optional	sc
+dev/syscons/scvtb.c		optional	sc
+dev/syscons/syscons.c		optional	sc
 gnu/i386/fpemul/div_small.s	optional	gpl_math_emulate
 gnu/i386/fpemul/errors.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_arith.c	optional	gpl_math_emulate
@@ -97,22 +97,22 @@ gnu/i386/fpemul/reg_u_mul.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_u_sub.s	optional	gpl_math_emulate
 gnu/i386/fpemul/wm_shrx.s	optional	gpl_math_emulate
 gnu/i386/fpemul/wm_sqrt.s	optional	gpl_math_emulate
-gnu/i386/isa/dgb.c		optional	dgb	device-driver
-gnu/i386/isa/dgm.c		optional	dgm	device-driver
-gnu/i386/isa/sound/awe_wave.c	optional	awe	device-driver
-i386/apm/apm.c			optional	apm	device-driver
+gnu/i386/isa/dgb.c		optional	dgb
+gnu/i386/isa/dgm.c		optional	dgm
+gnu/i386/isa/sound/awe_wave.c	optional	awe
+i386/apm/apm.c			optional	apm
 i386/apm/apm_setup.s		optional	apm
-i386/eisa/3c5x9.c		optional	ep	device-driver
-i386/eisa/adv_eisa.c		optional	adv	device-driver
-i386/eisa/ahb.c			optional	ahb	device-driver
-i386/eisa/ahc_eisa.c		optional	eisa ahc device-driver	   \
+i386/eisa/3c5x9.c		optional	ep
+i386/eisa/adv_eisa.c		optional	adv
+i386/eisa/ahb.c			optional	ahb
+i386/eisa/ahc_eisa.c		optional	eisa ahc    \
 	dependency	"aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c"
-i386/eisa/bt_eisa.c		optional	bt	device-driver
-i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
+i386/eisa/bt_eisa.c		optional	bt
+i386/eisa/dpt_eisa.c		optional	eisa dpt
 i386/eisa/eisaconf.c		optional	eisa
-i386/eisa/if_fea.c		optional	fea	device-driver
-i386/eisa/if_vx_eisa.c		optional	vx	device-driver
-i386/i386/autoconf.c		standard	device-driver
+i386/eisa/if_fea.c		optional	fea
+i386/eisa/if_vx_eisa.c		optional	vx
+i386/i386/autoconf.c		standard
 i386/i386/bios.c		standard
 i386/i386/bioscall.s		standard
 i386/i386/busdma_machdep.c	standard
@@ -171,152 +171,152 @@ i386/ibcs2/ibcs2_util.c		optional	ibcs2
 i386/ibcs2/ibcs2_xenix.c	optional	ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional	ibcs2
 i386/ibcs2/imgact_coff.c	optional	ibcs2
-i386/isa/adv_isa.c		optional	adv	device-driver
-i386/isa/aha_isa.c		optional	aha	device-driver
-i386/isa/asc.c			optional	asc	device-driver
-i386/isa/atapi-cd.c		optional	wcd	device-driver
-i386/isa/atapi.c		optional	wdc	device-driver
+i386/isa/adv_isa.c		optional	adv
+i386/isa/aha_isa.c		optional	aha
+i386/isa/asc.c			optional	asc
+i386/isa/atapi-cd.c		optional	wcd
+i386/isa/atapi.c		optional	wdc
 i386/isa/clock.c		standard
-i386/isa/cronyx.c		optional	cx	device-driver
-i386/isa/ctx.c			optional	ctx	device-driver
-i386/isa/cx.c			optional	cx	device-driver
-i386/isa/cy.c			optional	cy	device-driver
+i386/isa/cronyx.c		optional	cx
+i386/isa/ctx.c			optional	ctx
+i386/isa/cx.c			optional	cx
+i386/isa/cy.c			optional	cy
 i386/isa/diskslice_machdep.c	standard
-i386/isa/elink.c		optional	ep	device-driver
-i386/isa/elink.c		optional	ie	device-driver
-isa/fd.c			optional	fd	device-driver
-i386/isa/fla.c			optional	fla	device-driver
-i386/isa/gpib.c			optional	gp	device-driver
-i386/isa/gsc.c			optional	gsc	device-driver
-i386/isa/if_ar.c		optional	ar	device-driver
-i386/isa/if_cs.c		optional	cs	device-driver
-i386/isa/if_cx.c		optional	cx	device-driver
-i386/isa/if_ed.c		optional	ed	device-driver
-i386/isa/if_el.c		optional	el	device-driver
-i386/isa/if_ep.c		optional	ep	device-driver
-i386/isa/if_ex.c		optional	ex	device-driver
-i386/isa/if_fe.c		optional	fe	device-driver
-i386/isa/if_ie.c		optional	ie	device-driver
-i386/isa/if_le.c		optional	le	device-driver
-i386/isa/if_lnc.c		optional	lnc	device-driver
-i386/isa/if_rdp.c		optional	rdp	device-driver
-i386/isa/if_sr.c		optional	sr	device-driver
-i386/isa/if_wi.c		optional	wi	device-driver
-i386/isa/if_wl.c		optional	wl	device-driver
-i386/isa/if_ze.c		optional	ze	device-driver
-i386/isa/if_zp.c		optional	zp	device-driver
+i386/isa/elink.c		optional	ep
+i386/isa/elink.c		optional	ie
+isa/fd.c			optional	fd
+i386/isa/fla.c			optional	fla
+i386/isa/gpib.c			optional	gp
+i386/isa/gsc.c			optional	gsc
+i386/isa/if_ar.c		optional	ar
+i386/isa/if_cs.c		optional	cs
+i386/isa/if_cx.c		optional	cx
+i386/isa/if_ed.c		optional	ed
+i386/isa/if_el.c		optional	el
+i386/isa/if_ep.c		optional	ep
+i386/isa/if_ex.c		optional	ex
+i386/isa/if_fe.c		optional	fe
+i386/isa/if_ie.c		optional	ie
+i386/isa/if_le.c		optional	le
+i386/isa/if_lnc.c		optional	lnc
+i386/isa/if_rdp.c		optional	rdp
+i386/isa/if_sr.c		optional	sr
+i386/isa/if_wi.c		optional	wi
+i386/isa/if_wl.c		optional	wl
+i386/isa/if_ze.c		optional	ze
+i386/isa/if_zp.c		optional	zp
 i386/isa/intr_machdep.c		standard
 i386/isa/ipl_funcs.c		standard				   \
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} $<"
-i386/isa/isa.c			optional	isa	device-driver
-i386/isa/isa_compat.c		optional	isa	device-driver
-i386/isa/isa_dma.c		optional	isa	device-driver
-i386/isa/istallion.c		optional	stli	device-driver
-i386/isa/joy.c			optional	joy	device-driver
-i386/isa/labpc.c		optional	labpc	device-driver
-i386/isa/loran.c		optional	loran	device-driver
-i386/isa/matcd/matcd.c		optional	matcd	device-driver
-i386/isa/mcd.c			optional	mcd	device-driver
-i386/isa/mse.c			optional	mse	device-driver
-i386/isa/npx.c			mandatory	npx	device-driver
-i386/isa/pcaudio.c		optional	pca	device-driver
-i386/isa/pcf.c			optional	pcf	device-driver
-i386/isa/pcibus.c		optional	pci	device-driver
-i386/isa/pcicx.c		optional	ze	device-driver
-i386/isa/pcicx.c		optional	zp	device-driver
-i386/isa/pcvt/pcvt_drv.c	optional	vt	device-driver
-i386/isa/pcvt/pcvt_ext.c	optional	vt	device-driver
-i386/isa/pcvt/pcvt_kbd.c	optional	vt	device-driver
-i386/isa/pcvt/pcvt_out.c	optional	vt	device-driver
-i386/isa/pcvt/pcvt_sup.c	optional	vt	device-driver
-i386/isa/pcvt/pcvt_vtf.c	optional	vt	device-driver
-i386/isa/pnp.c			optional	pnp	device-driver
-i386/isa/ppc.c			optional	ppc	device-driver
+i386/isa/isa.c			optional	isa
+i386/isa/isa_compat.c		optional	isa
+i386/isa/isa_dma.c		optional	isa
+i386/isa/istallion.c		optional	stli
+i386/isa/joy.c			optional	joy
+i386/isa/labpc.c		optional	labpc
+i386/isa/loran.c		optional	loran
+i386/isa/matcd/matcd.c		optional	matcd
+i386/isa/mcd.c			optional	mcd
+i386/isa/mse.c			optional	mse
+i386/isa/npx.c			mandatory	npx
+i386/isa/pcaudio.c		optional	pca
+i386/isa/pcf.c			optional	pcf
+i386/isa/pcibus.c		optional	pci
+i386/isa/pcicx.c		optional	ze
+i386/isa/pcicx.c		optional	zp
+i386/isa/pcvt/pcvt_drv.c	optional	vt
+i386/isa/pcvt/pcvt_ext.c	optional	vt
+i386/isa/pcvt/pcvt_kbd.c	optional	vt
+i386/isa/pcvt/pcvt_out.c	optional	vt
+i386/isa/pcvt/pcvt_sup.c	optional	vt
+i386/isa/pcvt/pcvt_vtf.c	optional	vt
+i386/isa/pnp.c			optional	pnp
+i386/isa/ppc.c			optional	ppc
 i386/isa/prof_machdep.c		optional	profiling-routine
 i386/isa/random_machdep.c	standard
-i386/isa/rc.c			optional	rc	device-driver
-i386/isa/rp.c			optional	rp	device-driver
-i386/isa/scd.c			optional	scd	device-driver
-i386/isa/si.c			optional	si	device-driver
-i386/isa/si2_z280.c		optional	si	device-driver
-i386/isa/si3_t225.c		optional	si	device-driver
-i386/isa/snd/ad1848.c		optional	pcm	device-driver
-i386/isa/snd/clones.c		optional	pcm	device-driver
-i386/isa/snd/dmabuf.c		optional	pcm	device-driver
-i386/isa/snd/sb_dsp.c		optional	pcm	device-driver
-i386/isa/snd/sound.c		optional	pcm	device-driver
-i386/isa/sound/ad1848.c		optional	css	device-driver
-i386/isa/sound/ad1848.c		optional	gus	device-driver
-i386/isa/sound/ad1848.c		optional	gusxvi	device-driver
-i386/isa/sound/ad1848.c		optional	mss	device-driver
-i386/isa/sound/ad1848.c		optional	sscape	device-driver
-i386/isa/sound/ad1848.c		optional	trix	device-driver
-i386/isa/sound/ad1848.c		optional	sscape_mss	device-driver
-i386/isa/sound/adlib_card.c	optional	opl	device-driver
-i386/isa/sound/adlib_card.c	optional	trix	device-driver
-i386/isa/sound/audio.c		optional	snd	device-driver
-i386/isa/sound/cs4232.c		optional	css	device-driver
-i386/isa/sound/dev_table.c	optional	snd	device-driver
-i386/isa/sound/dmabuf.c		optional	snd	device-driver
-i386/isa/sound/gus_card.c	optional	gus	device-driver
-i386/isa/sound/gus_midi.c	optional	gus	device-driver
-i386/isa/sound/gus_vol.c	optional	gus	device-driver
-i386/isa/sound/gus_wave.c	optional	gus	device-driver
-i386/isa/sound/ics2101.c	optional	gus	device-driver
-i386/isa/sound/midi_synth.c	optional	css	device-driver
-i386/isa/sound/midi_synth.c	optional	gus	device-driver
-i386/isa/sound/midi_synth.c	optional	mpu	device-driver
-i386/isa/sound/midi_synth.c	optional	mss	device-driver
-i386/isa/sound/midi_synth.c	optional	pas	device-driver
-i386/isa/sound/midi_synth.c	optional	sb	device-driver
-i386/isa/sound/midi_synth.c	optional	sscape	device-driver
-i386/isa/sound/midi_synth.c	optional	uart	device-driver
-i386/isa/sound/midibuf.c	optional	css	device-driver
-i386/isa/sound/midibuf.c	optional	gus	device-driver
-i386/isa/sound/midibuf.c	optional	mpu	device-driver
-i386/isa/sound/midibuf.c	optional	mss	device-driver
-i386/isa/sound/midibuf.c	optional	pas	device-driver
-i386/isa/sound/midibuf.c	optional	sb	device-driver
-i386/isa/sound/midibuf.c	optional	sscape	device-driver
-i386/isa/sound/midibuf.c	optional	uart	device-driver
-i386/isa/sound/mpu401.c		optional	mpu	device-driver
-i386/isa/sound/mpu401.c		optional	sscape	device-driver
-i386/isa/sound/opl3.c		optional	opl	device-driver
-i386/isa/sound/opl3.c		optional	trix	device-driver
-i386/isa/sound/pas2_card.c	optional	pas	device-driver
-i386/isa/sound/pas2_midi.c	optional	pas	device-driver
-i386/isa/sound/pas2_mixer.c	optional	pas	device-driver
-i386/isa/sound/pas2_pcm.c	optional	pas	device-driver
-i386/isa/sound/patmgr.c		optional	snd	device-driver
-i386/isa/sound/sb16_dsp.c	optional	sbxvi	device-driver
-i386/isa/sound/sb16_midi.c	optional	sbmidi	device-driver
-i386/isa/sound/sb_card.c	optional	sb	device-driver
-i386/isa/sound/sb_dsp.c		optional	sb	device-driver
-i386/isa/sound/sb_midi.c	optional	sb	device-driver
-i386/isa/sound/sb_mixer.c	optional	sb	device-driver
-i386/isa/sound/sequencer.c	optional	snd	device-driver
-i386/isa/sound/sound_switch.c	optional	snd	device-driver
-i386/isa/sound/sound_timer.c	optional	css	device-driver
-i386/isa/sound/sound_timer.c	optional	gus	device-driver
-i386/isa/sound/sound_timer.c	optional	mss	device-driver
-i386/isa/sound/sound_timer.c	optional	mss	device-driver
-i386/isa/sound/sound_timer.c	optional	sscape	device-driver
-i386/isa/sound/sound_timer.c	optional	trix	device-driver
-i386/isa/sound/soundcard.c	optional	snd	device-driver
-i386/isa/sound/sscape.c		optional	sscape	device-driver
-i386/isa/sound/sys_timer.c	optional	snd	device-driver
-i386/isa/sound/trix.c		optional	trix	device-driver
-i386/isa/sound/uart6850.c	optional	uart	device-driver
-i386/isa/spigot.c		optional	spigot	device-driver
-i386/isa/spkr.c			optional	speaker	device-driver
-i386/isa/stallion.c		optional	stl	device-driver
-i386/isa/tw.c			optional	tw	device-driver
-i386/isa/vesa.c			optional	vga	device-driver
-i386/isa/wd.c			optional	wd	device-driver
-i386/isa/wd.c			optional	wdc	device-driver
-i386/isa/wfd.c			optional	wfd	device-driver
-i386/isa/wst.c			optional	wst	device-driver
-i386/isa/wt.c			optional	wt	device-driver
+i386/isa/rc.c			optional	rc
+i386/isa/rp.c			optional	rp
+i386/isa/scd.c			optional	scd
+i386/isa/si.c			optional	si
+i386/isa/si2_z280.c		optional	si
+i386/isa/si3_t225.c		optional	si
+i386/isa/snd/ad1848.c		optional	pcm
+i386/isa/snd/clones.c		optional	pcm
+i386/isa/snd/dmabuf.c		optional	pcm
+i386/isa/snd/sb_dsp.c		optional	pcm
+i386/isa/snd/sound.c		optional	pcm
+i386/isa/sound/ad1848.c		optional	css
+i386/isa/sound/ad1848.c		optional	gus
+i386/isa/sound/ad1848.c		optional	gusxvi
+i386/isa/sound/ad1848.c		optional	mss
+i386/isa/sound/ad1848.c		optional	sscape
+i386/isa/sound/ad1848.c		optional	trix
+i386/isa/sound/ad1848.c		optional	sscape_mss
+i386/isa/sound/adlib_card.c	optional	opl
+i386/isa/sound/adlib_card.c	optional	trix
+i386/isa/sound/audio.c		optional	snd
+i386/isa/sound/cs4232.c		optional	css
+i386/isa/sound/dev_table.c	optional	snd
+i386/isa/sound/dmabuf.c		optional	snd
+i386/isa/sound/gus_card.c	optional	gus
+i386/isa/sound/gus_midi.c	optional	gus
+i386/isa/sound/gus_vol.c	optional	gus
+i386/isa/sound/gus_wave.c	optional	gus
+i386/isa/sound/ics2101.c	optional	gus
+i386/isa/sound/midi_synth.c	optional	css
+i386/isa/sound/midi_synth.c	optional	gus
+i386/isa/sound/midi_synth.c	optional	mpu
+i386/isa/sound/midi_synth.c	optional	mss
+i386/isa/sound/midi_synth.c	optional	pas
+i386/isa/sound/midi_synth.c	optional	sb
+i386/isa/sound/midi_synth.c	optional	sscape
+i386/isa/sound/midi_synth.c	optional	uart
+i386/isa/sound/midibuf.c	optional	css
+i386/isa/sound/midibuf.c	optional	gus
+i386/isa/sound/midibuf.c	optional	mpu
+i386/isa/sound/midibuf.c	optional	mss
+i386/isa/sound/midibuf.c	optional	pas
+i386/isa/sound/midibuf.c	optional	sb
+i386/isa/sound/midibuf.c	optional	sscape
+i386/isa/sound/midibuf.c	optional	uart
+i386/isa/sound/mpu401.c		optional	mpu
+i386/isa/sound/mpu401.c		optional	sscape
+i386/isa/sound/opl3.c		optional	opl
+i386/isa/sound/opl3.c		optional	trix
+i386/isa/sound/pas2_card.c	optional	pas
+i386/isa/sound/pas2_midi.c	optional	pas
+i386/isa/sound/pas2_mixer.c	optional	pas
+i386/isa/sound/pas2_pcm.c	optional	pas
+i386/isa/sound/patmgr.c		optional	snd
+i386/isa/sound/sb16_dsp.c	optional	sbxvi
+i386/isa/sound/sb16_midi.c	optional	sbmidi
+i386/isa/sound/sb_card.c	optional	sb
+i386/isa/sound/sb_dsp.c		optional	sb
+i386/isa/sound/sb_midi.c	optional	sb
+i386/isa/sound/sb_mixer.c	optional	sb
+i386/isa/sound/sequencer.c	optional	snd
+i386/isa/sound/sound_switch.c	optional	snd
+i386/isa/sound/sound_timer.c	optional	css
+i386/isa/sound/sound_timer.c	optional	gus
+i386/isa/sound/sound_timer.c	optional	mss
+i386/isa/sound/sound_timer.c	optional	mss
+i386/isa/sound/sound_timer.c	optional	sscape
+i386/isa/sound/sound_timer.c	optional	trix
+i386/isa/sound/soundcard.c	optional	snd
+i386/isa/sound/sscape.c		optional	sscape
+i386/isa/sound/sys_timer.c	optional	snd
+i386/isa/sound/trix.c		optional	trix
+i386/isa/sound/uart6850.c	optional	uart
+i386/isa/spigot.c		optional	spigot
+i386/isa/spkr.c			optional	speaker
+i386/isa/stallion.c		optional	stl
+i386/isa/tw.c			optional	tw
+i386/isa/vesa.c			optional	vga
+i386/isa/wd.c			optional	wd
+i386/isa/wd.c			optional	wdc
+i386/isa/wfd.c			optional	wfd
+i386/isa/wst.c			optional	wst
+i386/isa/wt.c			optional	wt
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux
 i386/linux/linux_file.c		optional	compat_linux
@@ -331,37 +331,37 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
-i4b/layer1/i4b_avm_a1.c		optional	isic	device-driver
-i4b/layer1/i4b_avm_fritz_pci.c	optional	isic	device-driver
-i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic	device-driver
-i4b/layer1/i4b_bchan.c		optional	isic	device-driver
-i4b/layer1/i4b_ctx_s0P.c	optional	isic	device-driver
-i4b/layer1/i4b_drn_ngo.c	optional	isic	device-driver
-i4b/layer1/i4b_dynalink.c	optional	isic	device-driver
-i4b/layer1/i4b_elsa_qs1i.c	optional	isic	device-driver
-i4b/layer1/i4b_elsa_qs1p.c	optional	isic	device-driver
-i4b/layer1/i4b_hscx.c		optional	isic	device-driver
-i4b/layer1/i4b_isac.c		optional	isic	device-driver
-i4b/layer1/i4b_isic.c		optional	isic	device-driver
-i4b/layer1/i4b_isic_isa.c	optional	isic	device-driver
-i4b/layer1/i4b_isic_pci.c	optional	isic	device-driver
-i4b/layer1/i4b_isic_pcmcia.c	optional	isic	device-driver
-i4b/layer1/i4b_isic_pnp.c	optional	isic	device-driver
-i4b/layer1/i4b_itk_ix1.c	optional	isic	device-driver
-i4b/layer1/i4b_l1.c		optional	isic	device-driver
-i4b/layer1/i4b_l1fsm.c		optional	isic	device-driver
-i4b/layer1/i4b_sws.c		optional	isic	device-driver
-i4b/layer1/i4b_tel_s016.c	optional	isic	device-driver
-i4b/layer1/i4b_tel_s0163.c	optional	isic	device-driver
-i4b/layer1/i4b_tel_s08.c	optional	isic	device-driver
-i4b/layer1/i4b_tel_s0P.c	optional	isic	device-driver
-i4b/layer1/i4b_usr_sti.c	optional	isic	device-driver
-isa/atkbd_isa.c			optional	atkbd	device-driver
-isa/atkbdc_isa.c		optional	atkbdc	device-driver
-isa/psm.c			optional	psm	device-driver
-isa/sio.c			optional	sio	device-driver
-isa/syscons_isa.c		optional	sc	device-driver
-isa/vga_isa.c			optional	vga	device-driver
+i4b/layer1/i4b_avm_a1.c		optional	isic
+i4b/layer1/i4b_avm_fritz_pci.c	optional	isic
+i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic
+i4b/layer1/i4b_bchan.c		optional	isic
+i4b/layer1/i4b_ctx_s0P.c	optional	isic
+i4b/layer1/i4b_drn_ngo.c	optional	isic
+i4b/layer1/i4b_dynalink.c	optional	isic
+i4b/layer1/i4b_elsa_qs1i.c	optional	isic
+i4b/layer1/i4b_elsa_qs1p.c	optional	isic
+i4b/layer1/i4b_hscx.c		optional	isic
+i4b/layer1/i4b_isac.c		optional	isic
+i4b/layer1/i4b_isic.c		optional	isic
+i4b/layer1/i4b_isic_isa.c	optional	isic
+i4b/layer1/i4b_isic_pci.c	optional	isic
+i4b/layer1/i4b_isic_pcmcia.c	optional	isic
+i4b/layer1/i4b_isic_pnp.c	optional	isic
+i4b/layer1/i4b_itk_ix1.c	optional	isic
+i4b/layer1/i4b_l1.c		optional	isic
+i4b/layer1/i4b_l1fsm.c		optional	isic
+i4b/layer1/i4b_sws.c		optional	isic
+i4b/layer1/i4b_tel_s016.c	optional	isic
+i4b/layer1/i4b_tel_s0163.c	optional	isic
+i4b/layer1/i4b_tel_s08.c	optional	isic
+i4b/layer1/i4b_tel_s0P.c	optional	isic
+i4b/layer1/i4b_usr_sti.c	optional	isic
+isa/atkbd_isa.c			optional	atkbd
+isa/atkbdc_isa.c		optional	atkbdc
+isa/psm.c			optional	psm
+isa/sio.c			optional	sio
+isa/syscons_isa.c		optional	sc
+isa/vga_isa.c			optional	vga
 libkern/bcd.c			standard
 libkern/divdi3.c		standard
 libkern/index.c			standard
@@ -382,5 +382,5 @@ libkern/strncmp.c		standard
 libkern/strncpy.c		standard
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
-pci/es1370.c			optional	pcm pci	device-driver
-pci/ide_pci.c			optional	wd pci	device-driver
+pci/es1370.c			optional	pcm pci
+pci/ide_pci.c			optional	wd pci