5 files changed, 28 insertions, 8 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f2c28428777a..0ee904859d7b 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.441 1998/06/30 07:36:33 jmg Exp $
+#	$Id: LINT,v 1.442 1998/06/30 08:01:28 jmg 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
@@ -1320,7 +1320,7 @@ options AHC_ALLOW_MEMIO
 options	"EISA_SLOTS=12"
 
 #
-# PCI devices:
+# PCI devices & PCI options:
 #
 # The main PCI bus device is `pci'.  It provides auto-detection and
 # configuration support for all devices on the PCI bus, using either
@@ -1396,6 +1396,11 @@ device		bktr0
 options         OVERRIDE_TUNER=NO_TUNER
 
 #
+# PCI options
+#
+#options	PCI_QUIET	#quiets PCI code on chipset settings
+
+#
 # PCCARD/PCMCIA
 #
 # card: slot controller
diff --git a/sys/conf/options b/sys/conf/options
index 796f3f3be7ad..f6aa3054ceab 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.81 1998/06/30 07:47:42 jmg Exp $
+#	$Id: options,v 1.82 1998/06/30 08:01:28 jmg Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -244,6 +244,9 @@ KEY_DEBUG		opt_key.h
 # Size of the kernel message buffer
 MSGBUF_SIZE		opt_msgbuf.h
 
+# PCI related options
+PCI_QUIET		opt_pci.h
+
 # NFS options
 NFS_MINATTRTIMO		opt_nfs.h
 NFS_MAXATTRTIMO		opt_nfs.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index f2c28428777a..0ee904859d7b 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.441 1998/06/30 07:36:33 jmg Exp $
+#	$Id: LINT,v 1.442 1998/06/30 08:01:28 jmg 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
@@ -1320,7 +1320,7 @@ options AHC_ALLOW_MEMIO
 options	"EISA_SLOTS=12"
 
 #
-# PCI devices:
+# PCI devices & PCI options:
 #
 # The main PCI bus device is `pci'.  It provides auto-detection and
 # configuration support for all devices on the PCI bus, using either
@@ -1396,6 +1396,11 @@ device		bktr0
 options         OVERRIDE_TUNER=NO_TUNER
 
 #
+# PCI options
+#
+#options	PCI_QUIET	#quiets PCI code on chipset settings
+
+#
 # PCCARD/PCMCIA
 #
 # card: slot controller
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index f2c28428777a..0ee904859d7b 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.441 1998/06/30 07:36:33 jmg Exp $
+#	$Id: LINT,v 1.442 1998/06/30 08:01:28 jmg 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
@@ -1320,7 +1320,7 @@ options AHC_ALLOW_MEMIO
 options	"EISA_SLOTS=12"
 
 #
-# PCI devices:
+# PCI devices & PCI options:
 #
 # The main PCI bus device is `pci'.  It provides auto-detection and
 # configuration support for all devices on the PCI bus, using either
@@ -1396,6 +1396,11 @@ device		bktr0
 options         OVERRIDE_TUNER=NO_TUNER
 
 #
+# PCI options
+#
+#options	PCI_QUIET	#quiets PCI code on chipset settings
+
+#
 # PCCARD/PCMCIA
 #
 # card: slot controller
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index 5642fa1e7386..e9828f7edea7 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcisupport.c,v 1.68 1998/05/11 01:05:54 dyson Exp $
+**  $Id: pcisupport.c,v 1.69 1998/06/08 04:07:51 dyson Exp $
 **
 **  Device driver for DEC/INTEL PCI chipsets.
 **
@@ -41,6 +41,8 @@
 ***************************************************************************
 */
 
+#include "opt_pci.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>