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/cbus | |
| 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/cbus')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 4 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 606c39e..daee5ca 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.23 1997/05/30 09:57:08 kato Exp $ + * $Id: clock.c,v 1.24 1997/05/31 12:43:17 kato Exp $ */ /* @@ -76,7 +76,7 @@ #include <i386/isa/isa_device.h> #else #include <i386/isa/isa.h> -#include <i386/isa/isa_device.h> +#include <i386/isa/intr_machdep.h> #include <i386/isa/rtc.h> #endif #include <i386/isa/timerreg.h> diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 606c39e..daee5ca 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.23 1997/05/30 09:57:08 kato Exp $ + * $Id: clock.c,v 1.24 1997/05/31 12:43:17 kato Exp $ */ /* @@ -76,7 +76,7 @@ #include <i386/isa/isa_device.h> #else #include <i386/isa/isa.h> -#include <i386/isa/isa_device.h> +#include <i386/isa/intr_machdep.h> #include <i386/isa/rtc.h> #endif #include <i386/isa/timerreg.h> |
