Index: head/sys/conf/Makefile.i386
===================================================================
--- head/sys/conf/Makefile.i386	(revision 6801)
+++ head/sys/conf/Makefile.i386	(revision 6802)
@@ -1,199 +1,201 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.54 1995/01/29 23:42:11 phk Exp $
+#	$Id: Makefile.i386,v 1.55 1995/02/26 05:05:53 bde Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/i386/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/i386/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 # N.B.: DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE
 #	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
 #
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 # -DFOO		almost all options
 #
 CC?=	cc 
 CPP?=	cpp
 LD?=	/usr/bin/ld
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 I386=	${S}/i386
 
 CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls
 #
 # The following flags are next up for working on:
 # -Wimplicit -Wnested-externs 
 #
 # When working on removing warnings from code, the `-Werror' flag should be
 # of material assistance.
 #
 COPTFLAGS?=-O
 # Not ready for -I- yet.  #include "foo.h" where foo.h is in the srcdir fails.
 INCLUDES= -nostdinc -I. -I$S -I$S/sys -I$S/../include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
 ASFLAGS=
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX errors leak out of all the pipes.  Should use cc *.S.
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CPP} -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
 SFILES=	${I386}/i386/exception.s ${I386}/i386/microtime.s \
 	${I386}/i386/support.s ${I386}/i386/swtch.s ${I386}/apm/apm_setup.s
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c
 SYSTEM_SFILES= ${I386}/i386/locore.s
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o 
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS} libkern.a
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o libkern.a
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	symorder -m ${SYMORDER_EXCLUDE} symbols.sort $@; \
 	size $@; chmod 755 $@
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %LOAD
 
+%CLEAN
+
 # This is slightly different from before in that if you define PROF
 # to anything, it will assume profiling.  Don't do "PROF=" to turn
 # profiling off!
 .if exists($S/libkern/obj)
 LIBKERNP=$S/libkern/obj
 .else
 LIBKERNP=$S/libkern
 .endif
 
 .if defined(PROF)
 LIBKERN=${LIBKERNP}/libkern_p.a
 .else
 LIBKERN=${LIBKERNP}/libkern.a
 .endif
 
 libkern.a: ${LIBKERN}
 	@rm -f libkern.a
 	ln -s ${LIBKERN} libkern.a
 
 ${LIBKERN}:
 	@(cd $S/libkern; make)
 
 clean:
 	rm -f eddep kernel tags *.o *.s errs linterrs makelinks genassym \
-	      symbols.exclude symbols.sort
+	      symbols.exclude symbols.sort ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
 #	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude: Makefile
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${I386}/i386/symbols.raw
 	grep -v '^#' ${I386}/i386/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${I386}/i386/locore.s assym.s
 	${NORMAL_S}
 
 # everything potentially depends on the Makefile since everything potentially
 # depends on the options.  Some things are more dependent on the Makefile for
 # historical reasons.
 machdep.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # depend on network configuration
 af.o uipc_proto.o locore.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 # Some of the defines that genassym outputs may well depend on the 
 # value of kernel options.
 genassym.o: ${I386}/i386/genassym.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} -static ${CFLAGS} ${PARAM} genassym.o -o $@
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	mkdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a ${COPTS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 	MKDEP_CPP=${CPP} ; export MKDEP_CPP ; \
 	mkdep -a -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 
 links:
 	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 install:
 	chflags noschg /kernel
 	mv /kernel /kernel.old
 	install -c -m 555 -o root -g wheel -fschg kernel /
 
 ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
     ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
 	${CC} -c ${CFLAGS} ioconf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
 vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/conf/Makefile.powerpc
===================================================================
--- head/sys/conf/Makefile.powerpc	(revision 6801)
+++ head/sys/conf/Makefile.powerpc	(revision 6802)
@@ -1,199 +1,201 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.54 1995/01/29 23:42:11 phk Exp $
+#	$Id: Makefile.i386,v 1.55 1995/02/26 05:05:53 bde Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/i386/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/i386/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 # N.B.: DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE
 #	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
 #
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 # -DFOO		almost all options
 #
 CC?=	cc 
 CPP?=	cpp
 LD?=	/usr/bin/ld
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 I386=	${S}/i386
 
 CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls
 #
 # The following flags are next up for working on:
 # -Wimplicit -Wnested-externs 
 #
 # When working on removing warnings from code, the `-Werror' flag should be
 # of material assistance.
 #
 COPTFLAGS?=-O
 # Not ready for -I- yet.  #include "foo.h" where foo.h is in the srcdir fails.
 INCLUDES= -nostdinc -I. -I$S -I$S/sys -I$S/../include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
 ASFLAGS=
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX errors leak out of all the pipes.  Should use cc *.S.
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CPP} -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
 SFILES=	${I386}/i386/exception.s ${I386}/i386/microtime.s \
 	${I386}/i386/support.s ${I386}/i386/swtch.s ${I386}/apm/apm_setup.s
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c
 SYSTEM_SFILES= ${I386}/i386/locore.s
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o 
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS} libkern.a
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o libkern.a
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	symorder -m ${SYMORDER_EXCLUDE} symbols.sort $@; \
 	size $@; chmod 755 $@
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %LOAD
 
+%CLEAN
+
 # This is slightly different from before in that if you define PROF
 # to anything, it will assume profiling.  Don't do "PROF=" to turn
 # profiling off!
 .if exists($S/libkern/obj)
 LIBKERNP=$S/libkern/obj
 .else
 LIBKERNP=$S/libkern
 .endif
 
 .if defined(PROF)
 LIBKERN=${LIBKERNP}/libkern_p.a
 .else
 LIBKERN=${LIBKERNP}/libkern.a
 .endif
 
 libkern.a: ${LIBKERN}
 	@rm -f libkern.a
 	ln -s ${LIBKERN} libkern.a
 
 ${LIBKERN}:
 	@(cd $S/libkern; make)
 
 clean:
 	rm -f eddep kernel tags *.o *.s errs linterrs makelinks genassym \
-	      symbols.exclude symbols.sort
+	      symbols.exclude symbols.sort ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
 #	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude: Makefile
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${I386}/i386/symbols.raw
 	grep -v '^#' ${I386}/i386/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${I386}/i386/locore.s assym.s
 	${NORMAL_S}
 
 # everything potentially depends on the Makefile since everything potentially
 # depends on the options.  Some things are more dependent on the Makefile for
 # historical reasons.
 machdep.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # depend on network configuration
 af.o uipc_proto.o locore.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 # Some of the defines that genassym outputs may well depend on the 
 # value of kernel options.
 genassym.o: ${I386}/i386/genassym.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} -static ${CFLAGS} ${PARAM} genassym.o -o $@
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	mkdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a ${COPTS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 	MKDEP_CPP=${CPP} ; export MKDEP_CPP ; \
 	mkdep -a -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 
 links:
 	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 install:
 	chflags noschg /kernel
 	mv /kernel /kernel.old
 	install -c -m 555 -o root -g wheel -fschg kernel /
 
 ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
     ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
 	${CC} -c ${CFLAGS} ioconf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
 vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/conf/files.i386
===================================================================
--- head/sys/conf/files.i386	(revision 6801)
+++ head/sys/conf/files.i386	(revision 6802)
@@ -1,183 +1,185 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.84 1995/02/17 08:45:59 bde Exp $
+#	$Id: files.i386,v 1.85 1995/02/23 17:19:54 bde Exp $
 #
 aic7xxx				optional	ahc	device-driver	   \
-	dependancy 	"$S/gnu/misc/aic7xxx/aic7xxx.c"			   \
+	dependency 	"$S/gnu/misc/aic7xxx/aic7xxx.c"			   \
 	compile-with	"${CC} -o $@ $>"				   \
-	no-obj no-implicit-rule
+	no-obj no-implicit-rule						   \
+	clean		"aic7xxx"
 aic7xxx_seq.h			optional	ahc	device-driver	   \
-	dependancy	"$S/gnu/misc/aic7xxx/aic7xxx.seq aic7xxx"	   \
+	dependency	"$S/gnu/misc/aic7xxx/aic7xxx.seq aic7xxx"	   \
 	compile-with	"./aic7xxx -o $@ $S/gnu/misc/aic7xxx/aic7xxx.seq"  \
-	no-obj no-implicit-rule before-depend
+	no-obj no-implicit-rule before-depend				   \
+	clean		"aic7xxx_seq.h"
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/i386/autoconf.c		standard	device-driver
 i386/i386/conf.c		standard
 i386/i386/cons.c		standard
 i386/i386/db_disasm.c		optional	ddb
 i386/i386/db_interface.c	optional	ddb
 i386/i386/db_trace.c		optional	ddb
 i386/i386/exception.s		standard
 i386/i386/in_cksum.c		optional	inet
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # i386/i386/locore.s		standard
 i386/i386/machdep.c		standard
 i386/i386/math_emulate.c	optional	math_emulate
 i386/i386/mem.c			standard
 i386/i386/microtime.s		standard
 i386/i386/ns_cksum.c		optional	ns
 i386/i386/pmap.c		standard
 i386/i386/procfs_machdep.c	optional	procfs
 i386/i386/support.s		standard
 i386/i386/swtch.s		standard
 i386/i386/sys_machdep.c		standard
 i386/i386/trap.c		standard
 i386/i386/userconfig.c		standard
 i386/i386/vm_machdep.c		standard
 i386/ibcs2/ibcs2_dummy.c	optional 	ibcs2
 i386/ibcs2/ibcs2_file.c		optional 	ibcs2
 i386/ibcs2/ibcs2_ioctl.c	optional 	ibcs2
 i386/ibcs2/ibcs2_ipc.c		optional 	ibcs2
 i386/ibcs2/ibcs2_isc.c		optional 	ibcs2
 i386/ibcs2/ibcs2_misc.c		optional 	ibcs2
 i386/ibcs2/ibcs2_signal.c	optional 	ibcs2
 i386/ibcs2/ibcs2_socksys.c	optional 	ibcs2
 i386/ibcs2/ibcs2_stats.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysent.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysi86.c	optional 	ibcs2
 i386/ibcs2/ibcs2_xenix.c	optional 	ibcs2
 i386/ibcs2/imgact_coff.c	optional	ibcs2
 #i386/ibcs2/imgact_elf.c	optional	svr4
 #i386/ibcs2/imgact_xout.c	optional	ibcs2
 i386/isa/aha1542.c		optional	aha	device-driver
 i386/isa/aha1742.c		optional	ahb	device-driver
 i386/isa/aic6360.c              optional        aic     device-driver
 i386/isa/aic7770.c		optional	ahc	device-driver
 i386/isa/b004.c			optional	bqu	device-driver
 i386/isa/bt742a.c		optional	bt	device-driver
 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/diskslice_machdep.c	standard
 i386/isa/elink.c		optional	ep	device-driver
 i386/isa/elink.c		optional	ie	device-driver
 i386/isa/fd.c			optional	fd	device-driver
 i386/isa/ft.c			optional	ft	device-driver
 i386/isa/gpib.c			optional	gp	device-driver
 i386/isa/gsc.c			optional	gsc	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_ie.c		optional	ie	device-driver
 i386/isa/if_is.c		optional	is	device-driver
 i386/isa/if_ix.c		optional	ix	device-driver
 i386/isa/if_le.c		optional	le	device-driver
 i386/isa/if_lnc.c		optional	lnc	device-driver
 i386/isa/if_ze.c		optional	ze	device-driver
 i386/isa/if_zp.c		optional	zp	device-driver
 i386/isa/isa.c			optional	isa	device-driver
 i386/isa/joy.c			optional        joy     device-driver
 i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/mcd.c			optional	mcd	device-driver
 i386/isa/mse.c			optional	mse	device-driver
 i386/isa/ncr5380.c		optional	nca	device-driver
 i386/isa/npx.c			optional	npx	device-driver
 i386/isa/pcaudio.c		optional	pca	device-driver
 i386/isa/pcd.c			optional	pcd	device-driver
 i386/isa/pcibus.c		optional	pci	device-driver
 i386/isa/pcic.c			optional	ze	device-driver
 i386/isa/pcic.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/prof_machdep.c		optional	profiling-routine
 i386/isa/psm.c			optional	psm	device-driver
 i386/isa/readMBR.c		standard	
 i386/isa/seagate.c		optional	sea	device-driver
 i386/isa/sio.c			optional	sio	device-driver
 i386/isa/sound/ad1848.c		optional	snd	device-driver
 i386/isa/sound/adlib_card.c	optional	snd	device-driver
 i386/isa/sound/audio.c		optional	snd	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	snd	device-driver
 i386/isa/sound/gus_midi.c	optional	snd	device-driver
 i386/isa/sound/gus_vol.c	optional	snd	device-driver
 i386/isa/sound/gus_wave.c	optional	snd	device-driver
 i386/isa/sound/ics2101.c	optional	snd	device-driver
 i386/isa/sound/midi_synth.c	optional	snd	device-driver
 i386/isa/sound/midibuf.c	optional	snd	device-driver
 i386/isa/sound/mpu401.c		optional	snd	device-driver
 i386/isa/sound/opl3.c		optional	snd	device-driver
 i386/isa/sound/pas2_card.c	optional	snd	device-driver
 i386/isa/sound/pas2_midi.c	optional	snd	device-driver
 i386/isa/sound/pas2_mixer.c	optional	snd	device-driver
 i386/isa/sound/pas2_pcm.c	optional	snd	device-driver
 i386/isa/sound/patmgr.c		optional	snd	device-driver
 i386/isa/sound/pss.c		optional	snd	device-driver
 i386/isa/sound/sb16_dsp.c	optional	snd	device-driver
 i386/isa/sound/sb16_midi.c	optional	snd	device-driver
 i386/isa/sound/sb_card.c	optional	snd	device-driver
 i386/isa/sound/sb_dsp.c		optional	snd	device-driver
 i386/isa/sound/sb_midi.c	optional	snd	device-driver
 i386/isa/sound/sb_mixer.c	optional	snd	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	snd	device-driver
 i386/isa/sound/soundcard.c	optional	snd	device-driver
 i386/isa/sound/sys_timer.c	optional	snd	device-driver
 i386/isa/sound/uart6850.c	optional	snd	device-driver
 i386/isa/sound/vat_audio.c	optional	vat_audio
 i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker
 i386/isa/syscons.c		optional	sc	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 i386/isa/ultra14f.c		optional	uha	device-driver
 i386/isa/wd.c			optional	wd	device-driver
 i386/isa/wd7000.c		optional	wds	device-driver
 i386/isa/wt.c			optional	wt	device-driver
 i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
-	dependancy	"aic7xxx_seq.h"
+	dependency	"aic7xxx_seq.h"
 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
 gnu/i386/fpemul/fpu_aux.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_entry.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_etc.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_trig.c	optional	gpl_math_emulate
 gnu/i386/fpemul/get_address.c	optional	gpl_math_emulate
 gnu/i386/fpemul/load_store.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_2xm1.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_atan.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_div.s	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_l2.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_mul64.s	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_sin.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_tan.c	optional	gpl_math_emulate
 gnu/i386/fpemul/polynomial.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_add_sub.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_compare.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_constant.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_div.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_ld_str.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_mul.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_norm.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_round.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_u_add.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_u_div.s	optional	gpl_math_emulate
 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/nic3008.c          optional        nic     device-driver
 gnu/i386/isa/nic3009.c          optional        nnic    device-driver
 gnu/i386/isa/scd.c		optional	scd	device-driver
Index: head/sys/i386/conf/Makefile.i386
===================================================================
--- head/sys/i386/conf/Makefile.i386	(revision 6801)
+++ head/sys/i386/conf/Makefile.i386	(revision 6802)
@@ -1,199 +1,201 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.54 1995/01/29 23:42:11 phk Exp $
+#	$Id: Makefile.i386,v 1.55 1995/02/26 05:05:53 bde Exp $
 #
 # Makefile for FreeBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/i386/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
 #	/sys/i386/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 # N.B.: DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE
 #	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
 #
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 # -DFOO		almost all options
 #
 CC?=	cc 
 CPP?=	cpp
 LD?=	/usr/bin/ld
 
 .if exists(./@/.)
 S=	./@
 .else
 S=	../..
 .endif
 I386=	${S}/i386
 
 CWARNFLAGS?=-W -Wreturn-type -Wcomment -Wredundant-decls
 #
 # The following flags are next up for working on:
 # -Wimplicit -Wnested-externs 
 #
 # When working on removing warnings from code, the `-Werror' flag should be
 # of material assistance.
 #
 COPTFLAGS?=-O
 # Not ready for -I- yet.  #include "foo.h" where foo.h is in the srcdir fails.
 INCLUDES= -nostdinc -I. -I$S -I$S/sys -I$S/../include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DLOAD_ADDRESS=0x${LOAD_ADDRESS}
 ASFLAGS=
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 # XXX errors leak out of all the pipes.  Should use cc *.S.
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CPP} -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
 
 SFILES=	${I386}/i386/exception.s ${I386}/i386/microtime.s \
 	${I386}/i386/support.s ${I386}/i386/swtch.s ${I386}/apm/apm_setup.s
 SYSTEM_CFILES= ioconf.c param.c vnode_if.c
 SYSTEM_SFILES= ${I386}/i386/locore.s
 SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} ioconf.o param.o 
 SYSTEM_DEP= Makefile symbols.exclude symbols.sort ${SYSTEM_OBJS} libkern.a
 SYSTEM_LD_HEAD= @echo loading $@; rm -f $@
 SYSTEM_LD= @${LD} -Bstatic -Z -T ${LOAD_ADDRESS} -o $@ -X ${SYSTEM_OBJS} vers.o libkern.a
 .if ${CFLAGS:M-g} == ""
 SYMORDER_EXCLUDE=-x symbols.exclude
 .endif
 SYSTEM_LD_TAIL= @echo rearranging symbols; \
 	symorder -m ${SYMORDER_EXCLUDE} symbols.sort $@; \
 	size $@; chmod 755 $@
 
 %BEFORE_DEPEND
 
 %OBJS
 
 %CFILES
 
 %LOAD
 
+%CLEAN
+
 # This is slightly different from before in that if you define PROF
 # to anything, it will assume profiling.  Don't do "PROF=" to turn
 # profiling off!
 .if exists($S/libkern/obj)
 LIBKERNP=$S/libkern/obj
 .else
 LIBKERNP=$S/libkern
 .endif
 
 .if defined(PROF)
 LIBKERN=${LIBKERNP}/libkern_p.a
 .else
 LIBKERN=${LIBKERNP}/libkern.a
 .endif
 
 libkern.a: ${LIBKERN}
 	@rm -f libkern.a
 	ln -s ${LIBKERN} libkern.a
 
 ${LIBKERN}:
 	@(cd $S/libkern; make)
 
 clean:
 	rm -f eddep kernel tags *.o *.s errs linterrs makelinks genassym \
-	      symbols.exclude symbols.sort
+	      symbols.exclude symbols.sort ${CLEAN}
 
 #lint: /tmp param.c
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
 #	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
 symbols.exclude: Makefile
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
 symbols.sort: ${I386}/i386/symbols.raw
 	grep -v '^#' ${I386}/i386/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: ${I386}/i386/locore.s assym.s
 	${NORMAL_S}
 
 # everything potentially depends on the Makefile since everything potentially
 # depends on the options.  Some things are more dependent on the Makefile for
 # historical reasons.
 machdep.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # depend on network configuration
 af.o uipc_proto.o locore.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
 # Some of the defines that genassym outputs may well depend on the 
 # value of kernel options.
 genassym.o: ${I386}/i386/genassym.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 
 genassym: genassym.o
 	${CC} -static ${CFLAGS} ${PARAM} genassym.o -o $@
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	mkdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
 	mkdep -a ${COPTS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
 	MKDEP_CPP=${CPP} ; export MKDEP_CPP ; \
 	mkdep -a -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 
 links:
 	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
 install:
 	chflags noschg /kernel
 	mv /kernel /kernel.old
 	install -c -m 555 -o root -g wheel -fschg kernel /
 
 ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
     ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
 	${CC} -c ${CFLAGS} ioconf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
 vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 	${CC} ${CFLAGS} -c vers.c
 
 vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
 
 %RULES
 
 # DO NOT DELETE THIS LINE -- make depend uses it
Index: head/sys/i386/conf/files.i386
===================================================================
--- head/sys/i386/conf/files.i386	(revision 6801)
+++ head/sys/i386/conf/files.i386	(revision 6802)
@@ -1,183 +1,185 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.84 1995/02/17 08:45:59 bde Exp $
+#	$Id: files.i386,v 1.85 1995/02/23 17:19:54 bde Exp $
 #
 aic7xxx				optional	ahc	device-driver	   \
-	dependancy 	"$S/gnu/misc/aic7xxx/aic7xxx.c"			   \
+	dependency 	"$S/gnu/misc/aic7xxx/aic7xxx.c"			   \
 	compile-with	"${CC} -o $@ $>"				   \
-	no-obj no-implicit-rule
+	no-obj no-implicit-rule						   \
+	clean		"aic7xxx"
 aic7xxx_seq.h			optional	ahc	device-driver	   \
-	dependancy	"$S/gnu/misc/aic7xxx/aic7xxx.seq aic7xxx"	   \
+	dependency	"$S/gnu/misc/aic7xxx/aic7xxx.seq aic7xxx"	   \
 	compile-with	"./aic7xxx -o $@ $S/gnu/misc/aic7xxx/aic7xxx.seq"  \
-	no-obj no-implicit-rule before-depend
+	no-obj no-implicit-rule before-depend				   \
+	clean		"aic7xxx_seq.h"
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/i386/autoconf.c		standard	device-driver
 i386/i386/conf.c		standard
 i386/i386/cons.c		standard
 i386/i386/db_disasm.c		optional	ddb
 i386/i386/db_interface.c	optional	ddb
 i386/i386/db_trace.c		optional	ddb
 i386/i386/exception.s		standard
 i386/i386/in_cksum.c		optional	inet
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # i386/i386/locore.s		standard
 i386/i386/machdep.c		standard
 i386/i386/math_emulate.c	optional	math_emulate
 i386/i386/mem.c			standard
 i386/i386/microtime.s		standard
 i386/i386/ns_cksum.c		optional	ns
 i386/i386/pmap.c		standard
 i386/i386/procfs_machdep.c	optional	procfs
 i386/i386/support.s		standard
 i386/i386/swtch.s		standard
 i386/i386/sys_machdep.c		standard
 i386/i386/trap.c		standard
 i386/i386/userconfig.c		standard
 i386/i386/vm_machdep.c		standard
 i386/ibcs2/ibcs2_dummy.c	optional 	ibcs2
 i386/ibcs2/ibcs2_file.c		optional 	ibcs2
 i386/ibcs2/ibcs2_ioctl.c	optional 	ibcs2
 i386/ibcs2/ibcs2_ipc.c		optional 	ibcs2
 i386/ibcs2/ibcs2_isc.c		optional 	ibcs2
 i386/ibcs2/ibcs2_misc.c		optional 	ibcs2
 i386/ibcs2/ibcs2_signal.c	optional 	ibcs2
 i386/ibcs2/ibcs2_socksys.c	optional 	ibcs2
 i386/ibcs2/ibcs2_stats.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysent.c	optional 	ibcs2
 i386/ibcs2/ibcs2_sysi86.c	optional 	ibcs2
 i386/ibcs2/ibcs2_xenix.c	optional 	ibcs2
 i386/ibcs2/imgact_coff.c	optional	ibcs2
 #i386/ibcs2/imgact_elf.c	optional	svr4
 #i386/ibcs2/imgact_xout.c	optional	ibcs2
 i386/isa/aha1542.c		optional	aha	device-driver
 i386/isa/aha1742.c		optional	ahb	device-driver
 i386/isa/aic6360.c              optional        aic     device-driver
 i386/isa/aic7770.c		optional	ahc	device-driver
 i386/isa/b004.c			optional	bqu	device-driver
 i386/isa/bt742a.c		optional	bt	device-driver
 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/diskslice_machdep.c	standard
 i386/isa/elink.c		optional	ep	device-driver
 i386/isa/elink.c		optional	ie	device-driver
 i386/isa/fd.c			optional	fd	device-driver
 i386/isa/ft.c			optional	ft	device-driver
 i386/isa/gpib.c			optional	gp	device-driver
 i386/isa/gsc.c			optional	gsc	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_ie.c		optional	ie	device-driver
 i386/isa/if_is.c		optional	is	device-driver
 i386/isa/if_ix.c		optional	ix	device-driver
 i386/isa/if_le.c		optional	le	device-driver
 i386/isa/if_lnc.c		optional	lnc	device-driver
 i386/isa/if_ze.c		optional	ze	device-driver
 i386/isa/if_zp.c		optional	zp	device-driver
 i386/isa/isa.c			optional	isa	device-driver
 i386/isa/joy.c			optional        joy     device-driver
 i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/mcd.c			optional	mcd	device-driver
 i386/isa/mse.c			optional	mse	device-driver
 i386/isa/ncr5380.c		optional	nca	device-driver
 i386/isa/npx.c			optional	npx	device-driver
 i386/isa/pcaudio.c		optional	pca	device-driver
 i386/isa/pcd.c			optional	pcd	device-driver
 i386/isa/pcibus.c		optional	pci	device-driver
 i386/isa/pcic.c			optional	ze	device-driver
 i386/isa/pcic.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/prof_machdep.c		optional	profiling-routine
 i386/isa/psm.c			optional	psm	device-driver
 i386/isa/readMBR.c		standard	
 i386/isa/seagate.c		optional	sea	device-driver
 i386/isa/sio.c			optional	sio	device-driver
 i386/isa/sound/ad1848.c		optional	snd	device-driver
 i386/isa/sound/adlib_card.c	optional	snd	device-driver
 i386/isa/sound/audio.c		optional	snd	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	snd	device-driver
 i386/isa/sound/gus_midi.c	optional	snd	device-driver
 i386/isa/sound/gus_vol.c	optional	snd	device-driver
 i386/isa/sound/gus_wave.c	optional	snd	device-driver
 i386/isa/sound/ics2101.c	optional	snd	device-driver
 i386/isa/sound/midi_synth.c	optional	snd	device-driver
 i386/isa/sound/midibuf.c	optional	snd	device-driver
 i386/isa/sound/mpu401.c		optional	snd	device-driver
 i386/isa/sound/opl3.c		optional	snd	device-driver
 i386/isa/sound/pas2_card.c	optional	snd	device-driver
 i386/isa/sound/pas2_midi.c	optional	snd	device-driver
 i386/isa/sound/pas2_mixer.c	optional	snd	device-driver
 i386/isa/sound/pas2_pcm.c	optional	snd	device-driver
 i386/isa/sound/patmgr.c		optional	snd	device-driver
 i386/isa/sound/pss.c		optional	snd	device-driver
 i386/isa/sound/sb16_dsp.c	optional	snd	device-driver
 i386/isa/sound/sb16_midi.c	optional	snd	device-driver
 i386/isa/sound/sb_card.c	optional	snd	device-driver
 i386/isa/sound/sb_dsp.c		optional	snd	device-driver
 i386/isa/sound/sb_midi.c	optional	snd	device-driver
 i386/isa/sound/sb_mixer.c	optional	snd	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	snd	device-driver
 i386/isa/sound/soundcard.c	optional	snd	device-driver
 i386/isa/sound/sys_timer.c	optional	snd	device-driver
 i386/isa/sound/uart6850.c	optional	snd	device-driver
 i386/isa/sound/vat_audio.c	optional	vat_audio
 i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker
 i386/isa/syscons.c		optional	sc	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 i386/isa/ultra14f.c		optional	uha	device-driver
 i386/isa/wd.c			optional	wd	device-driver
 i386/isa/wd7000.c		optional	wds	device-driver
 i386/isa/wt.c			optional	wt	device-driver
 i386/scsi/aic7xxx.c		optional	ahc	device-driver	   \
-	dependancy	"aic7xxx_seq.h"
+	dependency	"aic7xxx_seq.h"
 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
 gnu/i386/fpemul/fpu_aux.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_entry.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_etc.c	optional	gpl_math_emulate
 gnu/i386/fpemul/fpu_trig.c	optional	gpl_math_emulate
 gnu/i386/fpemul/get_address.c	optional	gpl_math_emulate
 gnu/i386/fpemul/load_store.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_2xm1.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_atan.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_div.s	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_l2.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_mul64.s	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_sin.c	optional	gpl_math_emulate
 gnu/i386/fpemul/poly_tan.c	optional	gpl_math_emulate
 gnu/i386/fpemul/polynomial.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_add_sub.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_compare.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_constant.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_div.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_ld_str.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_mul.c	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_norm.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_round.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_u_add.s	optional	gpl_math_emulate
 gnu/i386/fpemul/reg_u_div.s	optional	gpl_math_emulate
 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/nic3008.c          optional        nic     device-driver
 gnu/i386/isa/nic3009.c          optional        nnic    device-driver
 gnu/i386/isa/scd.c		optional	scd	device-driver