5 files changed, 19 insertions, 19 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
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 8a88f8d57820..12c4b54bf497 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.583 1999/04/16 21:22:08 peter Exp $
+#	$Id: LINT,v 1.584 1999/04/19 10:18:34 brian 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
@@ -827,7 +827,7 @@ options		"MSGBUF_SIZE=40960"
 #
 # Mandatory ISA devices: isa, npx
 #
-controller	isa0	at nexus?
+controller	isa0
 
 #
 # Options for `isa':
@@ -1632,7 +1632,7 @@ options	"EISA_SLOTS=12"
 # The "oltr" driver supports the following Olicom PCI token-ring adapters
 # OC-3136, OC-3137, OC-3139, OC-3140, OC-3141, OC-3540, OC-3250
 #
-controller	pci0	at nexus?
+controller	pci0
 controller	ahc1
 controller	ncr0
 controller	isp0
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7c9f64bbc36e..bbdf7542667f 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.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
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 8a88f8d57820..12c4b54bf497 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.583 1999/04/16 21:22:08 peter Exp $
+#	$Id: LINT,v 1.584 1999/04/19 10:18:34 brian 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
@@ -827,7 +827,7 @@ options		"MSGBUF_SIZE=40960"
 #
 # Mandatory ISA devices: isa, npx
 #
-controller	isa0	at nexus?
+controller	isa0
 
 #
 # Options for `isa':
@@ -1632,7 +1632,7 @@ options	"EISA_SLOTS=12"
 # The "oltr" driver supports the following Olicom PCI token-ring adapters
 # OC-3136, OC-3137, OC-3139, OC-3140, OC-3141, OC-3540, OC-3250
 #
-controller	pci0	at nexus?
+controller	pci0
 controller	ahc1
 controller	ncr0
 controller	isp0
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 8a88f8d57820..12c4b54bf497 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.583 1999/04/16 21:22:08 peter Exp $
+#	$Id: LINT,v 1.584 1999/04/19 10:18:34 brian 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
@@ -827,7 +827,7 @@ options		"MSGBUF_SIZE=40960"
 #
 # Mandatory ISA devices: isa, npx
 #
-controller	isa0	at nexus?
+controller	isa0
 
 #
 # Options for `isa':
@@ -1632,7 +1632,7 @@ options	"EISA_SLOTS=12"
 # The "oltr" driver supports the following Olicom PCI token-ring adapters
 # OC-3136, OC-3137, OC-3139, OC-3140, OC-3141, OC-3540, OC-3250
 #
-controller	pci0	at nexus?
+controller	pci0
 controller	ahc1
 controller	ncr0
 controller	isp0