diff options
| author | asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-10-30 22:41:46 +0000 |
| commit | 95ac832055c11e8031e18bcc9759b2d12b654e9b (patch) | |
| tree | 37f74d6fdf54e31c6c6d69a11d50e299cd0a1118 /sys/i386/include/clock.h | |
| parent | e1b78916a4b8d96475ebaa0033860c706702fe49 (diff) | |
| download | FreeBSD-src-95ac832055c11e8031e18bcc9759b2d12b654e9b.zip FreeBSD-src-95ac832055c11e8031e18bcc9759b2d12b654e9b.tar.gz | |
More merge and update.
(1) deleted #if 0
pc98/pc98/mse.c
(2) hold per-unit I/O ports in ed_softc
pc98/pc98/if_ed.c
pc98/pc98/if_ed98.h
(3) merge more files by segregating changes into headers.
new file (moved from pc98/pc98):
i386/isa/aic_98.h
deleted:
well, it's already in the commit message so I won't repeat the
long list here ;)
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/i386/include/clock.h')
| -rw-r--r-- | sys/i386/include/clock.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h index f20902f..0f3427f 100644 --- a/sys/i386/include/clock.h +++ b/sys/i386/include/clock.h @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $Id: clock.h,v 1.19 1996/10/17 17:31:25 bde Exp $ + * $Id: clock.h,v 1.20 1996/10/25 13:01:08 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -65,7 +65,11 @@ int sysbeep __P((int pitch, int period)); #ifdef CLOCK_HAIR +#ifdef PC98 +#include <pc98/pc98/pc98.h> /* XXX */ +#else #include <i386/isa/isa.h> /* XXX */ +#endif #include <i386/isa/timerreg.h> /* XXX */ static __inline u_int |
