[src/netbsd-1-4]: src/sys/arch/amiga/amiga pullup 1.108->1.109 (christos): co...

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

details:   https://anonhg.NetBSD.org/src/rev/9d8612f4a732
branches:  netbsd-1-4
changeset: 468583:9d8612f4a732
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 30 16:20:30 1999 +0000

description:
pullup 1.108->1.109 (christos): conflicts manually edited

diffstat:

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

diffs (17 lines):

diff -r 4c328f0787f6 -r 9d8612f4a732 sys/arch/amiga/amiga/locore.s
--- a/sys/arch/amiga/amiga/locore.s     Fri Apr 30 16:12:05 1999 +0000
+++ b/sys/arch/amiga/amiga/locore.s     Fri Apr 30 16:20:30 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.107 1999/03/26 21:18:50 is Exp $  */
+/*     $NetBSD: locore.s,v 1.107.2.1 1999/04/30 16:20:30 perry Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -48,6 +48,7 @@
 
 #include "opt_bb060stupidrom.h"
 #include "opt_compat_netbsd.h"
+#include "opt_compat_sunos.h"
 
 #include "assym.h"
 #include <machine/asm.h>