[src/netbsd-1-4]: src/sys/arch/x68k/x68k pullup 1.44->1.45 (christos); confli...

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

details:   https://anonhg.NetBSD.org/src/rev/dbdd23e6cdcf
branches:  netbsd-1-4
changeset: 468594:dbdd23e6cdcf
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 17:38:24 1999 +0000

description:
pullup 1.44->1.45 (christos); conflicts manually edited

diffstat:

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

diffs (17 lines):

diff -r da252c412fa6 -r dbdd23e6cdcf sys/arch/x68k/x68k/locore.s
--- a/sys/arch/x68k/x68k/locore.s       Fri Apr 30 17:17:25 1999 +0000
+++ b/sys/arch/x68k/x68k/locore.s       Fri Apr 30 17:38:24 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.41 1999/03/24 05:51:18 mrg Exp $  */
+/*     $NetBSD: locore.s,v 1.41.2.1 1999/04/30 17:38:24 perry Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,6 +43,7 @@
  */
 
 #include "opt_compat_netbsd.h"
+#include "opt_compat_sunos.h"
 #include "opt_ddb.h"
 
 #include "ite.h"