aboutsummaryrefslogtreecommitdiff
path: root/sys/amd64
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-04-13 19:38:12 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-04-13 19:38:12 +0000
commit3e3e4375c84d87aa9775d307f0ed61691f0cfe04 (patch)
tree07edb76981a31cc70f1039b667db538fa0597922 /sys/amd64
parentb8df55a044ec14f73785f667be24f8d7e76cb16f (diff)
Notes
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7ea722faa51bc..1d3e4f5ab94d2 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.156 1999/03/29 17:56:27 ken Exp $
+# $Id: GENERIC,v 1.157 1999/04/11 20:53:50 n_hibma Exp $
machine "i386"
cpu "I386_CPU"
@@ -60,7 +60,6 @@ controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2
disk fd0 at fdc0 drive 0
disk fd1 at fdc0 drive 1
-options "CMD640" # work around CMD640 chip deficiency
controller wdc0 at isa? port "IO_WD1" bio irq 14
disk wd0 at wdc0 drive 0
disk wd1 at wdc0 drive 1
@@ -69,8 +68,6 @@ controller wdc1 at isa? port "IO_WD2" bio irq 15
disk wd2 at wdc1 drive 0
disk wd3 at wdc1 drive 1
-options ATAPI #Enable ATAPI support for IDE bus
-options ATAPI_STATIC #Don't do it as an LKM
device wcd0 #IDE CD-ROM
device wfd0 #IDE Floppy (e.g. LS-120)