thorpej
Mon Sep  9 13:24:38 PDT 1996
Update of /cvsroot/src/sys/arch/pmax/dev
In directory netbsd1:/var/slash-tmp/cvs-serv24293

Modified Files:
      Tag: netbsd-1-2
	sii.c 
Log Message:
Pull up diffs between revs 1.13 and 1.14 (1.12 -> 1.13 was already
pulled up) by request of Jonathan Stone and Michael Hitch.  Log message:

revision 1.14  
date: 1996/09/07 01:19:45;  author: mhitch;  state: Exp;  lines: +2 -2
Add parenthesis to correct a check for current SII state, so that a forced
disconnect will be done (it would never have been done with the old code).


thorpej
Mon Sep  9 13:29:35 PDT 1996
Update of /cvsroot/src/sys/arch/pmax/conf
In directory netbsd1:/var/slash-tmp/cvs-serv24595

Modified Files:
      Tag: netbsd-1-2
	GENERIC 
Log Message:
Pull up diffs between revs 1.2 and 1.3 by request from Jonathan Stone.
Log message:

revision 1.3
date: 1996/08/28 05:49:35;  author: jonathan;  state: Exp;  lines: +4 -5
* Rename  miniroot GENERIC kernel to GENERIC
* Add changes needed/used to build 1.2 GENERIC kernel:
  * Delete obsolete and ambiguous DS5000 option.
  * Add CPU_R3000 which is now required to compile in mips1 locore support.
  * Add an explicit declaration of HZ.
  * back out COMPAT_12 for this revision.

Note that the COMPAT_12 change was not relevant in this pullup.