[src/netbsd-1-4]: src/sys/arch/next68k/next68k pullup 1.16->1.17 (christos); ...

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

details:   https://anonhg.NetBSD.org/src/rev/5acf20beedc4
branches:  netbsd-1-4
changeset: 468588:5acf20beedc4
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 16:30:26 1999 +0000

description:
pullup 1.16->1.17 (christos); conflicts manually edited

diffstat:

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

diffs (17 lines):

diff -r cdbaaa12d339 -r 5acf20beedc4 sys/arch/next68k/next68k/locore.s
--- a/sys/arch/next68k/next68k/locore.s Fri Apr 30 16:28:17 1999 +0000
+++ b/sys/arch/next68k/next68k/locore.s Fri Apr 30 16:30:26 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.15 1999/03/24 23:15:58 dbj Exp $  */
+/*     $NetBSD: locore.s,v 1.15.2.1 1999/04/30 16:30:26 perry Exp $    */
 
 /*
  * Copyright (c) 1998 Darrin B. Jewell
@@ -50,6 +50,7 @@
  */
 
 #include "opt_compat_netbsd.h"
+#include "opt_compat_sunos.h"
 #include "opt_ddb.h"
 
 #include "assym.h"