summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-09-19 13:35:18 +0000
committerkato <kato@FreeBSD.org>1998-09-19 13:35:18 +0000
commit6d56da355c242a8005b4a5e4f41b997d13581556 (patch)
treeaf212999eff05e726dcfd6e54fb40d83860c951f /sys
parentb8141a2f668d1c93e7f0bb2e4440068eddba19cc (diff)
downloadFreeBSD-src-6d56da355c242a8005b4a5e4f41b997d13581556.zip
FreeBSD-src-6d56da355c242a8005b4a5e4f41b997d13581556.tar.gz
Sync with sys/i386/conf/GENERIC revision 1.118.
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/conf/GENERIC3
-rw-r--r--sys/pc98/conf/GENERIC983
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 3b25c89..03d20d7 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: GENERIC98,v 1.43 1998/09/15 08:25:09 kato Exp $
+# $Id: GENERIC98,v 1.44 1998/09/15 14:10:55 kato Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@@ -36,7 +36,6 @@ options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
options EPSON_BOUNCEDMA #use bounce buufer for 15-16M
#options EPSON_MEMWIN #EPSON memory window support
options UCONSOLE #Allow users to grab the console
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 3b25c89..03d20d7 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: GENERIC98,v 1.43 1998/09/15 08:25:09 kato Exp $
+# $Id: GENERIC98,v 1.44 1998/09/15 14:10:55 kato Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@@ -36,7 +36,6 @@ options NFS_ROOT #NFS usable as root device
options PROCFS #Process filesystem
options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!]
options SCSI_DELAY=15000 #Be pessimistic about Joe SCSI device
-options SCSI_CAM #We're using CAM in this kernel
options EPSON_BOUNCEDMA #use bounce buufer for 15-16M
#options EPSON_MEMWIN #EPSON memory window support
options UCONSOLE #Allow users to grab the console
OpenPOWER on IntegriCloud