[src/netbsd-1-4]: src/sys/arch/mac68k/mac68k pullup 1.113->1.114 (christos): ...

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

details:   https://anonhg.NetBSD.org/src/rev/2b84b92bbedb
branches:  netbsd-1-4
changeset: 468586:2b84b92bbedb
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 16:27:52 1999 +0000

description:
pullup 1.113->1.114 (christos): conflicts manually edited

diffstat:

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

diffs (17 lines):

diff -r 8ca5f2173e37 -r 2b84b92bbedb sys/arch/mac68k/mac68k/locore.s
--- a/sys/arch/mac68k/mac68k/locore.s   Fri Apr 30 16:24:44 1999 +0000
+++ b/sys/arch/mac68k/mac68k/locore.s   Fri Apr 30 16:27:52 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.112 1999/03/24 05:51:03 mrg Exp $ */
+/*     $NetBSD: locore.s,v 1.112.2.1 1999/04/30 16:27:52 perry Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -78,6 +78,7 @@
  */
 
 #include "opt_compat_netbsd.h"
+#include "opt_compat_sunos.h"
 #include "opt_ddb.h"
 #include "assym.h"
 #include <machine/asm.h>