summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorsos <sos@FreeBSD.org>1998-12-27 13:55:48 +0000
committersos <sos@FreeBSD.org>1998-12-27 13:55:48 +0000
commit303c78f8b70b60f2ac90a2895fe607ef57cf355a (patch)
tree103c5676fcb642f54196bf98258925b7b6e3c3eb /sys/conf
parent6c6e9b35144ac0ad6a5f3a025c004080d76caa5b (diff)
downloadFreeBSD-src-303c78f8b70b60f2ac90a2895fe607ef57cf355a.zip
FreeBSD-src-303c78f8b70b60f2ac90a2895fe607ef57cf355a.tar.gz
Pre 3.0 branch cleanup sos#1: wcd
Superceded by acd driver...
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES6
-rw-r--r--sys/conf/files.i3863
-rw-r--r--sys/conf/majors4
3 files changed, 4 insertions, 9 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 01cd637..2781547 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.516 1998/12/27 13:06:40 phk Exp $
+# $Id: LINT,v 1.517 1998/12/27 13:40:55 phk Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -982,13 +982,9 @@ options ATAPI_STATIC #Don't do it as an LKM
#
options IDE_DELAY=8000 # Be optimistic about Joe IDE device
-# Use either the acd or the wcd device, not both!
# IDE CD-ROM & CD-R/RW driver - requires wdc controller and ATAPI option
device acd0
-# IDE CD-ROM driver - requires wdc controller and ATAPI option
-device wcd0
-
# IDE floppy driver - requires wdc controller and ATAPI option
device wfd0
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 9ce5364..0ef6faa 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $Id: files.i386,v 1.211 1998/12/27 13:06:41 phk Exp $
+# $Id: files.i386,v 1.212 1998/12/27 13:40:56 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -239,7 +239,6 @@ i386/isa/wd.c optional wdc device-driver
i386/isa/wd.c optional wd device-driver
i386/isa/atapi.c optional atapi device-driver
i386/isa/atapi-cd.c optional acd device-driver
-i386/isa/wcd.c optional wcd device-driver
i386/isa/wfd.c optional wfd device-driver
i386/isa/wst.c optional wst device-driver
i386/isa/wt.c optional wt device-driver
diff --git a/sys/conf/majors b/sys/conf/majors
index 963257b..53781ab 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.54 1998/12/02 21:26:11 jkh Exp $
+$Id: majors.i386,v 1.55 1998/12/03 08:32:49 jkh Exp $
Hopefully, this list will one day be obsoleted by DEVFS, but for now
this is the current allocation of device major numbers.
@@ -32,7 +32,7 @@ blkdev name comments
16 scd Sony CDROM interface
17 matcd Matsushita/Panasonic/Creative(SB) CDROM interface
18 ata "device independent" ATA/IDE driver
-19 wcdb ATAPI CDROM client of "ata"
+19 acdb ATAPI CDROM client of "ata"
21 ccd concatenated disk
22 gd Geometry disk.
24 wstb ATAPI tape client of "ata"
OpenPOWER on IntegriCloud