summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>1999-02-15 02:50:08 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>1999-02-15 02:50:08 +0000
commit95d591a84364029e0fcad845d08499218af3cf96 (patch)
treeaa4f4296b3363277ace81c7a50a36d12247fbf1b
parent8f4fc993995381c67ef4157384f2d889e57c0d39 (diff)
Notes
-rw-r--r--sys/i386/conf/GENERIC10
-rw-r--r--sys/i386/conf/LINT4
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 4ed5b963f3d1..3b6659cf32b8 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.143 1999/01/11 03:18:31 yokota Exp $
+# $Id: GENERIC,v 1.143.2.1 1999/02/14 19:55:39 jkh Exp $
machine "i386"
cpu "I386_CPU"
@@ -144,7 +144,13 @@ device sio1 at isa? port "IO_COM2" tty irq 3
device sio2 at isa? disable port "IO_COM3" tty irq 5
device sio3 at isa? disable port "IO_COM4" tty irq 9
-device lpt0 at isa? port? tty irq 7
+# Parallel port
+device ppc0 at isa? port? net irq 7
+controller ppbus0
+device nlpt0 at ppbus?
+device plip0 at ppbus?
+device ppi0 at ppbus?
+#controller vpo0 at ppbus?
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 384f738086d2..83ecfbca06d2 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.539 1999/01/20 14:49:10 eivind Exp $
+# $Id: LINT,v 1.539.2.1 1999/01/31 12:42:56 yokota 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
@@ -1089,7 +1089,7 @@ disk fd1 at fdc0 drive 1
#
# Other standard PC hardware: `lpt', `mse', `sio', etc.
#
-# lpt: printer port
+# lpt: printer port (deprecated, use ppbus instead)
# lpt specials:
# The port may be specified as ?. This will cause the
# driver to scan the BIOS port list.