[src/netbsd-1-4]: src/sys/arch/hp300/hp300 pullup 1.94->1.95 (christos): conf...

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

details:   https://anonhg.NetBSD.org/src/rev/8ca5f2173e37
branches:  netbsd-1-4
changeset: 468585:8ca5f2173e37
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 16:24:44 1999 +0000

description:
pullup 1.94->1.95 (christos): conflicts manually edited

diffstat:

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

diffs (17 lines):

diff -r 0567ac1f08f0 -r 8ca5f2173e37 sys/arch/hp300/hp300/locore.s
--- a/sys/arch/hp300/hp300/locore.s     Fri Apr 30 16:22:56 1999 +0000
+++ b/sys/arch/hp300/hp300/locore.s     Fri Apr 30 16:24:44 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.93 1999/03/24 05:50:59 mrg Exp $  */
+/*     $NetBSD: locore.s,v 1.93.2.1 1999/04/30 16:24:44 perry Exp $    */
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -44,6 +44,7 @@
  */
 
 #include "opt_compat_netbsd.h"
+#include "opt_compat_sunos.h"
 #include "opt_ddb.h"
 
 #include "assym.h"