aboutsummaryrefslogtreecommitdiff
path: root/sys/i386/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386/conf')
-rw-r--r--sys/i386/conf/GENERIC6
-rw-r--r--sys/i386/conf/LINT4
-rw-r--r--sys/i386/conf/NOTES4
-rw-r--r--sys/i386/conf/files.i3863
4 files changed, 4 insertions, 13 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index b0a077b6e659..5d16fd162f71 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/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.137 1998/12/27 13:06:40 phk Exp $
+# $Id: GENERIC,v 1.138 1998/12/27 13:12:59 phk Exp $
machine "i386"
cpu "I386_CPU"
@@ -58,10 +58,6 @@ controller pci0
controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2
disk fd0 at fdc0 drive 0
disk fd1 at fdc0 drive 1
-# Unless you know very well what you're doing, leave ft0 at drive 2, or
-# remove the line entirely if you don't need it. Trying to configure
-# it on another unit might cause surprises, see PR kern/7176.
-tape ft0 at fdc0 drive 2
options "CMD640" # work around CMD640 chip deficiency
controller wdc0 at isa? port "IO_WD1" bio irq 14
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 02cca8b4b0ff..01cd637fd4a3 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -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.515 1998/12/27 12:52:45 phk Exp $
+# $Id: LINT,v 1.516 1998/12/27 13:06:40 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
@@ -1021,8 +1021,6 @@ options FDC_PRINT_BOGUS_CHIPTYPE
disk fd0 at fdc0 drive 0
disk fd1 at fdc0 drive 1
-tape ft0 at fdc0 drive 2
-
#
# Other standard PC hardware: `lpt', `mse', `psm', `sio', etc.
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 02cca8b4b0ff..01cd637fd4a3 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/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.515 1998/12/27 12:52:45 phk Exp $
+# $Id: LINT,v 1.516 1998/12/27 13:06:40 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
@@ -1021,8 +1021,6 @@ options FDC_PRINT_BOGUS_CHIPTYPE
disk fd0 at fdc0 drive 0
disk fd1 at fdc0 drive 1
-tape ft0 at fdc0 drive 2
-
#
# Other standard PC hardware: `lpt', `mse', `psm', `sio', etc.
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 249a28542c05..9ce5364497db 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/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.210 1998/12/27 12:52:46 phk Exp $
+# $Id: files.i386,v 1.211 1998/12/27 13:06:41 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -108,7 +108,6 @@ i386/isa/diskslice_machdep.c standard
i386/isa/elink.c optional ep device-driver
i386/isa/elink.c optional ie device-driver
i386/isa/fd.c optional fd device-driver
-i386/isa/ft.c optional ft device-driver
i386/isa/gpib.c optional gp device-driver
i386/isa/asc.c optional asc device-driver
i386/isa/gsc.c optional gsc device-driver