diff options
author | kato <kato@FreeBSD.org> | 1997-03-15 15:58:43 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1997-03-15 15:58:43 +0000 |
commit | 9da6319149780cb1135a827ea90418f69def7eb6 (patch) | |
tree | fb938ca294c2d3e548f1ef9b8d96b5f955454a1f /sys | |
parent | eda1e4190ccf9f7e8f8da34a7983e64d4d4a9efb (diff) | |
download | FreeBSD-src-9da6319149780cb1135a827ea90418f69def7eb6.zip FreeBSD-src-9da6319149780cb1135a827ea90418f69def7eb6.tar.gz |
Synchronize with sys/i386/conf/GNERIC revision up to 1.88.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/pc98/conf/GENERIC | 4 | ||||
-rw-r--r-- | sys/pc98/conf/GENERIC98 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index c1d7958..13d2fa2 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id$ +# $Id: GENERIC98,v 1.17 1997/02/22 09:43:20 peter Exp $ # GENERIC98 -- Generic PC98 machine with WD/SCSI disks @@ -80,6 +80,7 @@ disk fd2 at fdc0 drive 2 disk fd3 at fdc0 drive 3 tape ft0 at fdc0 drive 4 +# options "CMD640" # work around CMD640 chip deficiency controller wdc0 at isa? port "IO_WD1" bio irq 9 vector wdintr disk wd0 at wdc0 drive 0 #disk wd1 at wdc0 drive 1 @@ -132,7 +133,6 @@ controller matcd0 at isa? port? bio device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr #options XSERVER # include code for XFree86 -# Mandatory, don't remove device npx0 at isa? port "IO_NPX" irq 8 vector npxintr # diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98 index c1d7958..13d2fa2 100644 --- a/sys/pc98/conf/GENERIC98 +++ b/sys/pc98/conf/GENERIC98 @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id$ +# $Id: GENERIC98,v 1.17 1997/02/22 09:43:20 peter Exp $ # GENERIC98 -- Generic PC98 machine with WD/SCSI disks @@ -80,6 +80,7 @@ disk fd2 at fdc0 drive 2 disk fd3 at fdc0 drive 3 tape ft0 at fdc0 drive 4 +# options "CMD640" # work around CMD640 chip deficiency controller wdc0 at isa? port "IO_WD1" bio irq 9 vector wdintr disk wd0 at wdc0 drive 0 #disk wd1 at wdc0 drive 1 @@ -132,7 +133,6 @@ controller matcd0 at isa? port? bio device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr #options XSERVER # include code for XFree86 -# Mandatory, don't remove device npx0 at isa? port "IO_NPX" irq 8 vector npxintr # |