summaryrefslogtreecommitdiff
path: root/sys/amd64
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-04-19 11:53:36 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-04-19 11:53:36 +0000
commitf71c851c25d3f621af7ff6760b51edcd6e6f4bc8 (patch)
tree3a11243c0f6a2907bbc5ce621eeb50f7b0edf876 /sys/amd64
parent3d88f91408f6cf62ebd2d0b5f03f3a7325292a9a (diff)
Notes
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7c9f64bbc36e..bbdf7542667f 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.162 1999/04/16 21:22:07 peter Exp $
+# $Id: GENERIC,v 1.163 1999/04/19 10:18:34 brian Exp $
machine "i386"
cpu "I386_CPU"
@@ -53,10 +53,10 @@ config kernel root on wd0
#options NAPIC=1 # number of IO APICs
#options NINTR=24 # number of INTs
-controller isa0 at nexus?
-#controller pnp0 # PnP support for ISA
-#controller eisa0
-controller pci0 at nexus?
+controller isa0
+controller pnp0 # PnP support for ISA
+controller eisa0
+controller pci0
controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2
disk fd0 at fdc0 drive 0