Resolve conflict with <m68k/cpu.h>

1997-08-12 15:47:00 +00:00 · 1997-08-12 15:47:00 +00:00 · 5c339e9f73
commit 5c339e9f73
parent 0e10f76c04
1 changed files with 3 additions and 2 deletions
--- a/sys/arch/sun3/sun3/trap.c
+++ b/sys/arch/sun3/sun3/trap.c
@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.71 1997/07/29 06:43:59 fair Exp $	*/
+/*	$NetBSD: trap.c,v 1.72 1997/08/12 15:47:00 gwr Exp $	*/

 /*
 * Copyright (c) 1994 Gordon W. Ross
@ -71,7 +71,8 @@
 #include <machine/reg.h>
 #include <machine/machdep.h>

-#include <m68k/cpu.h>
+/* XXX - Later, get this from <m68k/m68k.h> */
+void	regdump __P((struct trapframe *, int));

 #ifdef COMPAT_SUNOS
 #include <compat/sunos/sunos_syscall.h>