diff options
| author | kato <kato@FreeBSD.org> | 1997-06-02 15:45:40 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1997-06-02 15:45:40 +0000 |
| commit | 800e70338e229a63144a55975918f2573ee594e9 (patch) | |
| tree | a2c307134f4ee93e8b37bd594e0a07c23a6969b0 /sys/pc98/i386 | |
| parent | a45f5948d16726b965c3d1d4206c5908802caa42 (diff) | |
| download | FreeBSD-src-800e70338e229a63144a55975918f2573ee594e9.zip FreeBSD-src-800e70338e229a63144a55975918f2573ee594e9.tar.gz | |
Synchronize with following files:
Revision Changes Path
> 1.165 +2 -1 src/sys/i386/conf/files.i386
> 1.246 +2 -1 src/sys/i386/i386/machdep.c
> 1.98 +2 -2 src/sys/i386/i386/trap.c
> 1.87 +2 -2 src/sys/i386/isa/clock.c
> 1.89 +2 -356 src/sys/i386/isa/isa.c
> 1.45 +2 -1 src/sys/i386/isa/npx.c
Diffstat (limited to 'sys/pc98/i386')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 3 | ||||
| -rw-r--r-- | sys/pc98/i386/trap.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index f267033..3db20f5 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.41 1997/05/23 10:17:05 kato Exp $ + * $Id: machdep.c,v 1.42 1997/05/28 09:16:19 kato Exp $ */ #include "npx.h" @@ -117,6 +117,7 @@ #endif #include <i386/isa/isa_device.h> +#include <i386/isa/intr_machdep.h> #ifdef PC98 #include <pc98/pc98/pc98_machdep.h> #else diff --git a/sys/pc98/i386/trap.c b/sys/pc98/i386/trap.c index e1ffa68..34b5972 100644 --- a/sys/pc98/i386/trap.c +++ b/sys/pc98/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.21 1997/05/30 09:59:11 kato Exp $ + * $Id: trap.c,v 1.22 1997/05/31 12:43:11 kato Exp $ */ /* @@ -76,7 +76,7 @@ #include <machine/psl.h> #include <machine/reg.h> #include <machine/trap.h> -#include <machine/../isa/isa_device.h> +#include <machine/../isa/intr_machdep.h> #include <machine/smp.h> #ifdef POWERFAIL_NMI |
