summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>1998-09-18 00:46:42 +0000
committermjacob <mjacob@FreeBSD.org>1998-09-18 00:46:42 +0000
commit4cc465448df7c96076c53511536521851b35c503 (patch)
tree95d12b309dc4f7d4076f366ff144da4a4351c54a /sys/amd64
parent0cf3eaddd68dfd9c67a82679cb4ffa11a8c011aa (diff)
downloadFreeBSD-src-4cc465448df7c96076c53511536521851b35c503.zip
FreeBSD-src-4cc465448df7c96076c53511536521851b35c503.tar.gz
(requested by gibbs) Remove the SCSI_CAM option (and rework the isp driver
that had depended on it for compilation within or without CAM to use __FreeBSD_version instead).
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 59e1e19..b27938a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/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: GENERIC,v 1.116 1998/09/15 10:01:12 gibbs Exp $
+# $Id: GENERIC,v 1.117 1998/09/17 03:15:30 msmith Exp $
machine "i386"
cpu "I386_CPU"
@@ -33,7 +33,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 UCONSOLE #Allow users to grab the console
options FAILSAFE #Be conservative
options USERCONFIG #boot -c editor
OpenPOWER on IntegriCloud