[src/netbsd-1-4]: src/sys/arch/sun3/sun3 pullup 1.67->1.68 (christos); confli...

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cdbaaa12d339
branches:  netbsd-1-4
changeset: 468587:cdbaaa12d339
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 16:28:17 1999 +0000

description:
pullup 1.67->1.68 (christos); conflicts manually edited

diffstat:

 sys/arch/sun3/sun3/locore.s |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 2b84b92bbedb -r cdbaaa12d339 sys/arch/sun3/sun3/locore.s
--- a/sys/arch/sun3/sun3/locore.s       Fri Apr 30 16:27:52 1999 +0000
+++ b/sys/arch/sun3/sun3/locore.s       Fri Apr 30 16:28:17 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.66 1999/03/24 05:51:14 mrg Exp $  */
+/*     $NetBSD: locore.s,v 1.66.2.1 1999/04/30 16:28:17 perry Exp $    */
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -44,6 +44,7 @@
  */
 
 #include "opt_compat_netbsd.h"
+#include "opt_compat_sunos.h"
 
 #include "assym.h"
 #include <machine/asm.h>