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/pc98/cbus/cbus.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/pc98/cbus/cbus.h')
| -rw-r--r-- | sys/pc98/cbus/cbus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h index 84c77b4..6a369f7 100644 --- a/sys/pc98/cbus/cbus.h +++ b/sys/pc98/cbus/cbus.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 - * $Id: pc98.h,v 1.5 1996/10/09 21:46:34 asami Exp $ + * $Id: pc98.h,v 1.6 1996/10/23 07:25:22 asami Exp $ */ #ifndef _PC98_PC98_PC98_H_ @@ -73,7 +73,7 @@ #define IO_NMI 0x050 /* NMI Control */ #define IO_WAIT 0x05F /* WAIT 0.6 us */ #define IO_GDC1 0x060 /* 7220 GDC Text Control */ -#define IO_TIMER 0x071 /* 8253C Timer */ +#define IO_TIMER1 0x071 /* 8253C Timer */ #define IO_SASI 0x080 /* SASI Hard Disk Controller */ #define IO_FD1 0x090 /* 765A 1MB FDC */ #define IO_GDC2 0x0a0 /* 7220 GDC Graphic Control */ |
