Module Name:	syssrc
Committed By:	itojun
Date:		Sun Nov 21 14:00:45 UTC 1999

Modified Files:
	syssrc/sys/arch/alpha/conf: GENERIC
	syssrc/sys/arch/amiga/conf: GENERIC
	syssrc/sys/arch/arm32/conf: GENERIC
	syssrc/sys/arch/atari/conf: GENERIC
	syssrc/sys/arch/bebox/conf: GENERIC
	syssrc/sys/arch/hp300/conf: GENERIC
	syssrc/sys/arch/hpcmips/conf: GENERIC
	syssrc/sys/arch/i386/conf: GENERIC
	syssrc/sys/arch/mac68k/conf: GENERIC
	syssrc/sys/arch/macppc/conf: GENERIC
	syssrc/sys/arch/mmeye/conf: GENERIC
	syssrc/sys/arch/mvme68k/conf: GENERIC
	syssrc/sys/arch/newsmips/conf: GENERIC
	syssrc/sys/arch/next68k/conf: GENERIC
	syssrc/sys/arch/ofppc/conf: GENERIC
	syssrc/sys/arch/pc532/conf: GENERIC
	syssrc/sys/arch/pica/conf: GENERIC
	syssrc/sys/arch/pmax/conf: GENERIC
	syssrc/sys/arch/sparc/conf: GENERIC
	syssrc/sys/arch/sparc64/conf: GENERIC
	syssrc/sys/arch/sun3/conf: GENERIC
	syssrc/sys/arch/vax/conf: GENERIC
	syssrc/sys/arch/x68k/conf: GENERIC
Removed Files:
	syssrc/sys/arch/alpha/conf: GENERIC.v6
	syssrc/sys/arch/amiga/conf: GENERIC.v6
	syssrc/sys/arch/arm32/conf: GENERIC.v6
	syssrc/sys/arch/atari/conf: GENERIC.v6
	syssrc/sys/arch/bebox/conf: GENERIC.v6
	syssrc/sys/arch/hp300/conf: GENERIC.v6
	syssrc/sys/arch/mac68k/conf: GENERIC.v6
	syssrc/sys/arch/macppc/conf: GENERIC.v6
	syssrc/sys/arch/mvme68k/conf: GENERIC.v6
	syssrc/sys/arch/newsmips/conf: GENERIC.v6
	syssrc/sys/arch/next68k/conf: GENERIC.v6
	syssrc/sys/arch/ofppc/conf: GENERIC.v6
	syssrc/sys/arch/pc532/conf: GENERIC.v6
	syssrc/sys/arch/pica/conf: GENERIC.v6
	syssrc/sys/arch/pmax/conf: GENERIC.v6
	syssrc/sys/arch/sparc/conf: GENERIC.v6
	syssrc/sys/arch/sparc64/conf: GENERIC.v6
	syssrc/sys/arch/sun3/conf: GENERIC.v6
	syssrc/sys/arch/vax/conf: GENERIC.v6
	syssrc/sys/arch/x68k/conf: GENERIC.v6

Log Message:
bring in content of GENERIC.v6 into GENERIC.
remove GENERIC.v6 file (as it is part of GENERIC now).

"faith" interface is commented out by default as it is not really for
general use.
IPsec items are commented out as well, though we can enable "options IPSEC"
without export-related issue ("options IPSEC" will enable authentication
portion only).  We may need to think about it again.

if you have problem compiling with INET6 on archs I do not have access to,
please contact me.

XXX what to do with arch/arm32/SHARK{,.v6}?


To generate a diff of this commit:
cvs rdiff -r1.136 -r1.137 syssrc/sys/arch/alpha/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/alpha/conf/GENERIC.v6
cvs rdiff -r1.130 -r1.131 syssrc/sys/arch/amiga/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/amiga/conf/GENERIC.v6
cvs rdiff -r1.58 -r1.59 syssrc/sys/arch/arm32/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/arm32/conf/GENERIC.v6
cvs rdiff -r1.56 -r1.57 syssrc/sys/arch/atari/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/atari/conf/GENERIC.v6
cvs rdiff -r1.20 -r1.21 syssrc/sys/arch/bebox/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/bebox/conf/GENERIC.v6
cvs rdiff -r1.48 -r1.49 syssrc/sys/arch/hp300/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/hp300/conf/GENERIC.v6
cvs rdiff -r1.14 -r1.15 syssrc/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -r1.278 -r1.279 syssrc/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.91 -r1.92 syssrc/sys/arch/mac68k/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/mac68k/conf/GENERIC.v6
cvs rdiff -r1.42 -r1.43 syssrc/sys/arch/macppc/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/macppc/conf/GENERIC.v6
cvs rdiff -r1.4 -r1.5 syssrc/sys/arch/mmeye/conf/GENERIC
cvs rdiff -r1.3 -r1.4 syssrc/sys/arch/mvme68k/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/mvme68k/conf/GENERIC.v6
cvs rdiff -r1.11 -r1.12 syssrc/sys/arch/newsmips/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/newsmips/conf/GENERIC.v6
cvs rdiff -r1.20 -r1.21 syssrc/sys/arch/next68k/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/next68k/conf/GENERIC.v6
cvs rdiff -r1.20 -r1.21 syssrc/sys/arch/ofppc/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/ofppc/conf/GENERIC.v6
cvs rdiff -r1.5 -r1.6 syssrc/sys/arch/pc532/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/pc532/conf/GENERIC.v6
cvs rdiff -r1.19 -r1.20 syssrc/sys/arch/pica/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/pica/conf/GENERIC.v6
cvs rdiff -r1.49 -r1.50 syssrc/sys/arch/pmax/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/pmax/conf/GENERIC.v6
cvs rdiff -r1.93 -r1.94 syssrc/sys/arch/sparc/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/sparc/conf/GENERIC.v6
cvs rdiff -r1.20 -r1.21 syssrc/sys/arch/sparc64/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/sparc64/conf/GENERIC.v6
cvs rdiff -r1.60 -r1.61 syssrc/sys/arch/sun3/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/sun3/conf/GENERIC.v6
cvs rdiff -r1.53 -r1.54 syssrc/sys/arch/vax/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/vax/conf/GENERIC.v6
cvs rdiff -r1.38 -r1.39 syssrc/sys/arch/x68k/conf/GENERIC
cvs rdiff -r1.2 -r0 syssrc/sys/arch/x68k/conf/GENERIC.v6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.