thorpej
Wed Sep  3 17:52:17 PDT 1997
Update of /cvsroot/src/sys/arch/alpha
In directory netbsd1:/var/slash-tmp/cvs-serv29466

Modified Files:
      Tag: marc-pcmcia
	STYLE 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:53:00 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/alpha
In directory netbsd1:/var/slash-tmp/cvs-serv29466/alpha

Modified Files:
      Tag: marc-pcmcia
	autoconf.c clock.c conf.c cpu.c dec_2100_a50.c dec_3000_300.c 
	dec_3000_500.c dec_axppci_33.c dec_eb164.c dec_eb64plus.c 
	dec_kn20aa.c dec_kn8ae.c disksubr.c genassym.c in_cksum.c 
	interrupt.c locore.s machdep.c mainbus.c mcclock.c md_root.c 
	mem.c pal.s pmap.c pmap.old.c process_machdep.c prom.c 
	promcons.c support.c sys_machdep.c trap.c vm_machdep.c 
Added Files:
      Tag: marc-pcmcia
	cpuconf.c 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:53:05 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/common
In directory netbsd1:/var/slash-tmp/cvs-serv29466/common

Modified Files:
      Tag: marc-pcmcia
	bus_dma.c sgmap_common.c sgmap_typedep.c shared_intr.c vga.c 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:53:06 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/conf
In directory netbsd1:/var/slash-tmp/cvs-serv29466/conf

Modified Files:
      Tag: marc-pcmcia
	files.alpha 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:53:13 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/include
In directory netbsd1:/var/slash-tmp/cvs-serv29466/include

Modified Files:
      Tag: marc-pcmcia
	alpha_cpu.h pmap.new.h pmap.old.h pte.h 
Added Files:
      Tag: marc-pcmcia
	cpuconf.h 
Removed Files:
      Tag: marc-pcmcia
	options.h 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:53:20 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/isa
In directory netbsd1:/var/slash-tmp/cvs-serv29466/isa

Modified Files:
      Tag: marc-pcmcia
	isa_machdep.c isafcns_jensen.c mcclock_isa.c pckbd.c pcppi.c 
	pms.c vga_isa.c 
Log Message:
Update marc-pcmcia branch from trunk.

scottr
Wed Sep  3 17:54:05 PDT 1997
Update of /cvsroot/src/sys/arch/mac68k/mac68k
In directory netbsd1:/var/slash-tmp/cvs-serv427

Modified Files:
	pmap_bootstrap.c 
Log Message:
Back out last commit; it interfered with NuBus video, and will
have to be reworked.

thorpej
Wed Sep  3 17:54:07 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/pci
In directory netbsd1:/var/slash-tmp/cvs-serv29466/pci

Modified Files:
      Tag: marc-pcmcia
	apecs.c apecs_bus_io.c apecs_bus_mem.c apecs_dma.c apecs_pci.c 
	apecsvar.h cia.c cia_dma.c cia_pci.c cia_swiz_bus_io.c 
	cia_swiz_bus_mem.c ciavar.h dwlpx.c dwlpx_bus_io.c 
	dwlpx_bus_mem.c dwlpx_dma.c dwlpx_pci.c dwlpxvar.h lca.c 
	lca_bus_io.c lca_bus_mem.c lca_dma.c lca_pci.c lcavar.h 
	pci_2100_a50.c pci_axppci_33.c pci_eb164.c pci_eb164_intr.s 
	pci_eb64plus_intr.s pci_kn20aa.c pci_kn8ae.c pci_machdep.c 
	pci_sgmap_pte32.c pci_sgmap_pte64.c sio.c sio_pic.c tga.c 
	tga_bt463.c tga_bt485.c tga_conf.c vga_pci.c 
Added Files:
      Tag: marc-pcmcia
	pci_swiz_bus_io_chipdep.c pci_swiz_bus_mem_chipdep.c 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:54:25 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/tc
In directory netbsd1:/var/slash-tmp/cvs-serv29466/tc

Modified Files:
      Tag: marc-pcmcia
	asc.c cfb.c ioasic.c mcclock_ioasic.c scc.c sfb.c 
	tc_3000_300.c tc_3000_500.c tc_bus_mem.c tc_conf.h tc_dma.c 
	tc_dma_3000_300.c tc_dma_3000_500.c tc_sgmap.c tcasic.c tcds.c 
	tcds_dma.c 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:54:31 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/tlsb
In directory netbsd1:/var/slash-tmp/cvs-serv29466/tlsb

Modified Files:
      Tag: marc-pcmcia
	gbus.c kftxx.c mcclock_tlsb.c tlsb.c tlsbmem.c 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:54:39 PDT 1997
Update of /cvsroot/src/sys/arch/alpha/wscons
In directory netbsd1:/var/slash-tmp/cvs-serv29466/wscons

Modified Files:
      Tag: marc-pcmcia
	event.c kbd.c ms.c wscons.c wscons_emul.c wscons_rinit.c 
	wscons_rops.c 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:57:07 PDT 1997
Update of /cvsroot/src/sys/arch/atari/include
In directory netbsd1:/var/slash-tmp/cvs-serv873

Modified Files:
      Tag: marc-pcmcia
	bus.h 
Log Message:
Update marc-pcmcia branch from trunk.

thorpej
Wed Sep  3 17:59:46 PDT 1997
Update of /cvsroot/src/sys/arch/mac68k/mac68k
In directory netbsd1:/var/slash-tmp/cvs-serv1199

Modified Files:
      Tag: marc-pcmcia
	clock.c locore.s machdep.c pmap_bootstrap.c vectors.s 
Log Message:
Update marc-pcmcia branch from trunk.