gwr
Wed Feb  4 20:56:34 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/conf
In directory netbsd1:/local/work/gwr/sun3/conf

Modified Files:
	DISKLESS DISKLESS3X FOUR_TTYS GENERIC GENERIC3X KGDB KGDB3X 
	Makefile.sun3 RAMDISK RAMDISK3X files.sun3 std.sun3 
Added Files:
	obio.sun3 obio.sun3x 
Removed Files:
	GENERIC_KGDB 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:56:48 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/dev
In directory netbsd1:/local/work/gwr/sun3/dev

Modified Files:
	bw2.c dma.c eeprom.c esp.c fd.c if_ie_obio.c if_ie_vme.c 
	if_le.c memerr.c si_obio.c si_vme.c zs.c 
Removed Files:
	idprom.c if_ie_vmes.c obio.c obmem.c vme.c 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:57:03 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/include
In directory netbsd1:/local/work/gwr/sun3/include

Modified Files:
	autoconf.h dvma.h dvma3.h dvma3x.h eeprom.h idprom.h leds.h 
	mon.h param.h param3.h param3x.h pmap.h pmap3.h pmap3x.h pte.h 
	pte3.h pte3x.h vmparam.h vmparam3.h vmparam3x.h 
Removed Files:
	control.h cpufunc.h machdep.h obio.h obmem.h saio.h 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:57:04 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/stand/bootxx
In directory netbsd1:/local/work/gwr/sun3/stand/bootxx

Modified Files:
	bootxx.c 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:57:18 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/stand/libsa
In directory netbsd1:/local/work/gwr/sun3/stand/libsa

Modified Files:
	Makefile SRT0.S SRT1.c clock.c dev_disk.c devopen.c dvma.h 
	exec_sun.c idprom.c netif_sun.c panic.c promboot.c promcons.c 
	promdev.c version.c 
Added Files:
	libsa.h sun3.c sun3x.c 
Removed Files:
	clock.h dvma.c promboot.h promdev.h 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:57:20 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/stand/netboot
In directory netbsd1:/local/work/gwr/sun3/stand/netboot

Modified Files:
	Makefile boot.c 
Removed Files:
	version.c 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:57:23 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/stand/tapeboot
In directory netbsd1:/local/work/gwr/sun3/stand/tapeboot

Modified Files:
	Makefile boot.c dev_tape.c rawfs.c 
Removed Files:
	version.c 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:57:24 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/stand/ufsboot
In directory netbsd1:/local/work/gwr/sun3/stand/ufsboot

Modified Files:
	Makefile boot.c 
Removed Files:
	version.c 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:57:53 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/sun3
In directory netbsd1:/local/work/gwr/sun3/sun3

Modified Files:
	autoconf.c bus_subr.c buserr.h cache.c clock.c conf.c 
	control.c control.h db_machdep.c db_memrw.c dvma.c fpu.c 
	genassym.c idprom.c interreg.h intreg.c isr.c kgdb_machdep.c 
	leds.c locore.s locore2.c machdep.c mainbus.c mem.c obio.c 
	obio.h obmem.c pmap.c sunmon.c sys_machdep.c trap.c 
	vm_machdep.c vme.c 
Added Files:
	cache.h enable.c enable.h fc.h machdep.h vme.h 
Removed Files:
	sun3_startup.c 
Log Message:
Merge arch/sun3x into arch/sun3

gwr
Wed Feb  4 20:58:04 PST 1998
Update of /a/cvsroot/src/sys/arch/sun3/sun3x
In directory netbsd1:/local/work/gwr/sun3/sun3x

Modified Files:
	bus_subr.c clock.c dvma.c genassym.c idprom.c iommu.c locore.s 
	locore2.c machdep.c mem.c obio.c obio.h pmap.c vme.c vme.h 
Added Files:
	enable.c 
Log Message:
Merge arch/sun3x into arch/sun3