From e131ba36e809fae872977b0f67ebb8e8c0a0d38b Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 29 Apr 2016 23:53:55 +0000
Subject: [PATCH] Move 'device pci' for the PCI bus driver to the MI NOTES
 file.

The PCI bus was already listed in all of the MD NOTES files and the
driver should at least compile on all platforms.
---
 sys/amd64/conf/NOTES   | 5 -----
 sys/arm/conf/NOTES     | 2 --
 sys/conf/NOTES         | 9 +++++++++
 sys/i386/conf/NOTES    | 5 -----
 sys/pc98/conf/NOTES    | 5 -----
 sys/powerpc/conf/NOTES | 1 -
 sys/sparc64/conf/NOTES | 1 -
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index c87ad640be1e..604a1a35f97e 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -176,11 +176,6 @@ options 	AUTO_EOI_1
 options 	MAXMEM=(128*1024)
 #options 	BROKEN_KEYBOARD_RESET
 
-#
-# PCI bus & PCI options:
-#
-device		pci
-
 #
 # AGP GART support
 device		agp
diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES
index 378b8a6ec9d2..ebb5d0410178 100644
--- a/sys/arm/conf/NOTES
+++ b/sys/arm/conf/NOTES
@@ -36,8 +36,6 @@ options 	SOC_MV_DISCOVERY
 options 	SOC_MV_KIRKWOOD
 options 	SOC_MV_ORION
 
-device		pci
-
 device		at91_board_bwct
 device		at91_board_ethernut5
 device		at91_board_hl200
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index d986a6507072..db929e81c5ba 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1403,6 +1403,15 @@ options 	LIBICONV
 # Size of the kernel message buffer.  Should be N * pagesize.
 options 	MSGBUF_SIZE=40960
 
+
+#####################################################################
+# HARDWARE BUS CONFIGURATION
+
+#
+# PCI bus & PCI options:
+#
+device		pci
+
 
 #####################################################################
 # HARDWARE DEVICE CONFIGURATION
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 5d8eaa3b9a3b..52bd6bf07dda 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -372,11 +372,6 @@ options 	EISA_SLOTS=12
 
 device		mca
 
-#
-# PCI bus & PCI options:
-#
-device		pci
-
 #
 # AGP GART support
 device		agp
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 1dfc2601c863..2abcb0796048 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -281,11 +281,6 @@ options 	MAXMEM=(128*1024)
 options 	EPSON_BOUNCEDMA
 options 	EPSON_MEMWIN
 
-#
-# PCI bus & PCI options:
-#
-device		pci
-
 #
 # AGP GART support
 device		agp
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 3cf1a28f3b82..fbceea7cb2c2 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -52,7 +52,6 @@ options 	SC_OFWFB		# OFW frame buffer
 device		cpufreq
 
 # Standard busses
-device		pci
 device		agp
 
 device		bm		# Apple BMAC (Big Mac Ethernet)
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index 0b15f383d36f..49557ed79443 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -20,7 +20,6 @@ cpu		SUN4U
 
 device		ebus
 device		isa
-device		pci
 device		sbus
 device		central
 device		fhc