Module Name:	syssrc
Committed By:	scottr
Date:		Mon Feb 14 07:01:50 UTC 2000

Modified Files:
	syssrc/sys/arch/mac68k/conf: GENERIC files.mac68k
	syssrc/sys/arch/mac68k/dev: adb.c adbsysasm.s aed.c aedvar.h grf_subr.c
	    grfvar.h mac68k5380.c sbcvar.h
	syssrc/sys/arch/mac68k/include: adbsys.h grfioctl.h
	syssrc/sys/arch/mac68k/mac68k: conf.c machdep.c pmap_bootstrap.c
	syssrc/sys/arch/mac68k/nubus: grf_nubus.c
	syssrc/sys/arch/mac68k/obio: grf_obio.c
Added Files:
	syssrc/sys/arch/mac68k/dev: akbd.c akbdmap.h akbdvar.h ams.c amsvar.h
	    grf_compat.c ite_compat.c maccons.c macfb.c macfbvar.h
Removed Files:
	syssrc/sys/arch/mac68k/dev: grf.c ite.c itevar.h kbd.c kbdvar.h ms.c
	    msvar.h

Log Message:
Merge wscons work onto the main development branch.


To generate a diff of this commit:
cvs rdiff -r1.95 -r1.96 syssrc/sys/arch/mac68k/conf/GENERIC
cvs rdiff -r1.92 -r1.93 syssrc/sys/arch/mac68k/conf/files.mac68k
cvs rdiff -r1.33 -r1.34 syssrc/sys/arch/mac68k/dev/adb.c
cvs rdiff -r1.9 -r1.10 syssrc/sys/arch/mac68k/dev/adbsysasm.s
cvs rdiff -r1.8 -r1.9 syssrc/sys/arch/mac68k/dev/aed.c
cvs rdiff -r1.2 -r1.3 syssrc/sys/arch/mac68k/dev/aedvar.h
cvs rdiff -r0 -r1.5 syssrc/sys/arch/mac68k/dev/akbd.c \
    syssrc/sys/arch/mac68k/dev/akbdvar.h syssrc/sys/arch/mac68k/dev/amsvar.h
cvs rdiff -r0 -r1.2 syssrc/sys/arch/mac68k/dev/akbdmap.h \
    syssrc/sys/arch/mac68k/dev/grf_compat.c \
    syssrc/sys/arch/mac68k/dev/ite_compat.c \
    syssrc/sys/arch/mac68k/dev/maccons.c syssrc/sys/arch/mac68k/dev/macfb.c \
    syssrc/sys/arch/mac68k/dev/macfbvar.h
cvs rdiff -r0 -r1.6 syssrc/sys/arch/mac68k/dev/ams.c
cvs rdiff -r1.63 -r0 syssrc/sys/arch/mac68k/dev/grf.c
cvs rdiff -r1.14 -r1.15 syssrc/sys/arch/mac68k/dev/grf_subr.c
cvs rdiff -r1.23 -r1.24 syssrc/sys/arch/mac68k/dev/grfvar.h
cvs rdiff -r1.52 -r0 syssrc/sys/arch/mac68k/dev/ite.c
cvs rdiff -r1.2 -r0 syssrc/sys/arch/mac68k/dev/itevar.h
cvs rdiff -r1.3 -r0 syssrc/sys/arch/mac68k/dev/kbd.c \
    syssrc/sys/arch/mac68k/dev/kbdvar.h syssrc/sys/arch/mac68k/dev/msvar.h
cvs rdiff -r1.35 -r1.36 syssrc/sys/arch/mac68k/dev/mac68k5380.c
cvs rdiff -r1.4 -r0 syssrc/sys/arch/mac68k/dev/ms.c
cvs rdiff -r1.7 -r1.8 syssrc/sys/arch/mac68k/dev/sbcvar.h
cvs rdiff -r1.12 -r1.13 syssrc/sys/arch/mac68k/include/adbsys.h
cvs rdiff -r1.7 -r1.8 syssrc/sys/arch/mac68k/include/grfioctl.h
cvs rdiff -r1.53 -r1.54 syssrc/sys/arch/mac68k/mac68k/conf.c
cvs rdiff -r1.242 -r1.243 syssrc/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -r1.52 -r1.53 syssrc/sys/arch/mac68k/mac68k/pmap_bootstrap.c
cvs rdiff -r1.55 -r1.56 syssrc/sys/arch/mac68k/nubus/grf_nubus.c
cvs rdiff -r1.43 -r1.44 syssrc/sys/arch/mac68k/obio/grf_obio.c

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