kernel: Remove opt_bus.h references where they are not needed.

It only defines BUS_DEBUG (if set) and BUS_DEBUG is only used in
subr_bus.c, so it doesn't need to be included anywhere else.

diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c
index 89f78d2..3091e10 100644 (file)
--- a/sys/bus/pci/pci.c
+++ b/sys/bus/pci/pci.c
@@ -28,7 +28,6 @@
  * $FreeBSD: src/sys/dev/pci/pci.c,v 1.355.2.9.2.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include "opt_bus.h"
 #include "opt_acpi.h"
 #include "opt_compat_oldpci.h"
 

diff --git a/sys/bus/pci/pci_compat.c b/sys/bus/pci/pci_compat.c
index ded00e2..a471292 100644 (file)
--- a/sys/bus/pci/pci_compat.c
+++ b/sys/bus/pci/pci_compat.c
@@ -24,12 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/pci_compat.c,v 1.35.2.1 2001/10/14 21:14:14 luigi Exp $
- * $DragonFly: src/sys/bus/pci/pci_compat.c,v 1.14 2007/05/13 18:33:56 swildner Exp $
- *
  */
 
-#include "opt_bus.h"
-
 /* for compatibility to FreeBSD-2.2 and 3.x versions of PCI code */
 
 #include <sys/param.h>

diff --git a/sys/bus/pci/pci_user.c b/sys/bus/pci/pci_user.c
index d9ffcea..4eb11ab 100644 (file)
--- a/sys/bus/pci/pci_user.c
+++ b/sys/bus/pci/pci_user.c
@@ -26,7 +26,6 @@
  * $FreeBSD: src/sys/dev/pci/pci_user.c,v 1.22.2.4.2.1 2009/04/15 03:14:26 kensmith Exp $
  */
 
-#include "opt_bus.h"   /* XXX trim includes */
 #include "opt_compat.h"
 
 #include <sys/param.h>

diff --git a/sys/bus/usb/ehci/Makefile b/sys/bus/usb/ehci/Makefile
index 19e130e..1d3b059 100644 (file)
--- a/sys/bus/usb/ehci/Makefile
+++ b/sys/bus/usb/ehci/Makefile
@@ -1,11 +1,9 @@
-# $DragonFly: src/sys/bus/usb/ehci/Makefile,v 1.2 2004/03/17 19:11:26 dillon Exp $
-#
 # Makefile for EHCI module
 
 .PATH: ${.CURDIR}/..
 KMOD= ehci
 SRCS= ehci.c ehci_pci.c \
-       opt_usb.h opt_bus.h \
+       opt_usb.h \
        bus_if.h device_if.h pci_if.h
 
 CFLAGS+= -I${.OBJDIR}/..

diff --git a/sys/bus/usb/ehci_pci.c b/sys/bus/usb/ehci_pci.c
index 8e41cfe..8779892 100644 (file)
--- a/sys/bus/usb/ehci_pci.c
+++ b/sys/bus/usb/ehci_pci.c
@@ -51,8 +51,6 @@
  * sharing of code between *BSD's
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

diff --git a/sys/bus/usb/ohci_pci.c b/sys/bus/usb/ohci_pci.c
index c7c961d..bb93c57 100644 (file)
--- a/sys/bus/usb/ohci_pci.c
+++ b/sys/bus/usb/ohci_pci.c
@@ -48,8 +48,6 @@
  * sharing of code between *BSD's
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

diff --git a/sys/bus/usb/uhci_pci.c b/sys/bus/usb/uhci_pci.c
index 61f487a..9b48a7c 100644 (file)
--- a/sys/bus/usb/uhci_pci.c
+++ b/sys/bus/usb/uhci_pci.c
@@ -47,8 +47,6 @@
  * sharing of code between *BSD's
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

diff --git a/sys/bus/usb/usb/Makefile b/sys/bus/usb/usb/Makefile
index fd523d7..cd0aedb 100644 (file)
--- a/sys/bus/usb/usb/Makefile
+++ b/sys/bus/usb/usb/Makefile
@@ -1,6 +1,4 @@
 # Makefile - module build for usb.ko
-#
-# $DragonFly: src/sys/bus/usb/usb/Makefile,v 1.4 2007/11/05 19:09:43 hasso Exp $
 
 S               = ${.CURDIR}/../../..
 .PATH:          $S/bus/pci $S/bus/usb
@@ -21,7 +19,7 @@ SRCS           = bus_if.h device_if.h usb_if.h usb_if.c \
 
 SRCS           += uhci_pci.c uhci.c uhcireg.h uhcivar.h
 SRCS           += ohci_pci.c ohci.c ohcireg.h ohcivar.h
-SRCS           += opt_bus.h pci_if.h
+SRCS           += pci_if.h
 
 .include <bsd.kmod.mk>
 

diff --git a/sys/dev/acpica5/Makefile b/sys/dev/acpica5/Makefile
index ec9292a..2ff929f 100644 (file)
--- a/sys/dev/acpica5/Makefile
+++ b/sys/dev/acpica5/Makefile
@@ -73,7 +73,7 @@ SRCS+=  acpi_timer.c acpi_hpet.c acpi_if.c
 SRCS+=  OsdDebug.c
 SRCS+=  OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=  OsdStream.c OsdSynch.c OsdTable.c OsdEnvironment.c
-SRCS+=  opt_acpi.h opt_bus.h opt_ddb.h
+SRCS+=  opt_acpi.h opt_ddb.h
 SRCS+=  device_if.h bus_if.h pci_if.h pcib_if.h isa_if.h acpi_if.h acpi_wmi_if.h
 MFILES = kern/device_if.m kern/bus_if.m bus/pci/pci_if.m bus/pci/pcib_if.m
 MFILES+= bus/isa/isa_if.m dev/acpica5/acpi_if.m dev/acpica5/acpi_wmi_if.m

diff --git a/sys/dev/agp/Makefile b/sys/dev/agp/Makefile
index 0e63842..4357022 100644 (file)
--- a/sys/dev/agp/Makefile
+++ b/sys/dev/agp/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD: src/sys/modules/agp/Makefile,v 1.2.2.4 2000/09/30 02:49:36 ps Exp $
-# $DragonFly: src/sys/dev/agp/Makefile,v 1.6 2007/09/12 08:31:43 hasso Exp $
 
 KMOD   = agp
 SRCS   = agp.c 
 SRCS   += agp_i810.c agp_ali.c agp_amd.c agp_x86_64.c agp_ati.c agp_nvidia.c
 SRCS   += agp_intel.c agp_sis.c agp_via.c
 SRCS   += agp_if.c device_if.h bus_if.h agp_if.h pci_if.h
-SRCS   += opt_bus.h opt_pci.h
+SRCS   += opt_pci.h
 MFILES = kern/device_if.m kern/bus_if.m dev/agp/agp_if.m bus/pci/pci_if.m
 
 .include <bsd.kmod.mk>

diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 58d5ce2..bf4e0bd 100644 (file)
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -26,8 +26,6 @@
  *     $FreeBSD: src/sys/dev/agp/agp.c,v 1.58 2007/11/12 21:51:36 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>

diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index e73c522..61cb626 100644 (file)
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -26,8 +26,6 @@
  *     $FreeBSD: src/sys/dev/agp/agp_ali.c,v 1.20 2007/11/12 21:51:36 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index 73995e9..e376fba 100644 (file)
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -26,8 +26,6 @@
  *     $FreeBSD: src/sys/dev/agp/agp_amd.c,v 1.25 2007/11/12 21:51:36 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_ati.c b/sys/dev/agp/agp_ati.c
index 262c43a..39a4003 100644 (file)
--- a/sys/dev/agp/agp_ati.c
+++ b/sys/dev/agp/agp_ati.c
@@ -28,8 +28,6 @@
  * $FreeBSD: src/sys/dev/agp/agp_ati.c,v 1.5 2007/11/12 21:51:36 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 9c9aa16..d052787 100644 (file)
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -32,8 +32,6 @@
  * 852GM/855GM/865G support added by David Dawes <dawes@xfree86.org>
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c
index 0b998c6..505ad4f 100644 (file)
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -26,8 +26,6 @@
  *     $FreeBSD: src/sys/dev/agp/agp_intel.c,v 1.36 2007/11/12 21:51:36 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_nvidia.c b/sys/dev/agp/agp_nvidia.c
index 162891d..58bad6d 100644 (file)
--- a/sys/dev/agp/agp_nvidia.c
+++ b/sys/dev/agp/agp_nvidia.c
@@ -31,8 +31,6 @@
  * NVIDIA nForce/nForce2 AGPGART Linux Kernel Patch.
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index 7c64573..602b337 100644 (file)
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -26,8 +26,6 @@
  *     $FreeBSD: src/sys/dev/agp/agp_sis.c,v 1.22 2007/11/12 21:51:37 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index dafee28..e47890a 100644 (file)
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -26,8 +26,6 @@
  *     $FreeBSD: src/sys/dev/agp/agp_via.c,v 1.26 2007/11/12 21:51:37 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/agp/agp_x86_64.c b/sys/dev/agp/agp_x86_64.c
index b802eb9..10c20dd 100644 (file)
--- a/sys/dev/agp/agp_x86_64.c
+++ b/sys/dev/agp/agp_x86_64.c
@@ -26,8 +26,6 @@
  * $FreeBSD: src/sys/dev/agp/agp_amd64.c,v 1.16 2007/11/12 21:51:36 jhb Exp $
  */
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/crypto/aesni/Makefile b/sys/dev/crypto/aesni/Makefile
index 6a1461b..499546d 100644 (file)
--- a/sys/dev/crypto/aesni/Makefile
+++ b/sys/dev/crypto/aesni/Makefile
@@ -3,6 +3,6 @@
 KMOD=  aesni
 SRCS=  aesni.c aesni_wrap.c
 SRCS+= aesencdec_$(MACHINE_ARCH).S aeskeys_$(MACHINE_ARCH).S
-SRCS+= device_if.h bus_if.h opt_bus.h cryptodev_if.h
+SRCS+= device_if.h bus_if.h cryptodev_if.h
 
 .include <bsd.kmod.mk>

diff --git a/sys/dev/crypto/glxsb/Makefile b/sys/dev/crypto/glxsb/Makefile
index b222982..c6d984c 100644 (file)
--- a/sys/dev/crypto/glxsb/Makefile
+++ b/sys/dev/crypto/glxsb/Makefile
@@ -1,6 +1,6 @@
 KMOD=  glxsb
 SRCS=  glxsb.c glxsb_hash.c
-SRCS+= device_if.h bus_if.h pci_if.h opt_bus.h
+SRCS+= device_if.h bus_if.h pci_if.h
 SRCS+= cryptodev_if.h
 
 .include <bsd.kmod.mk>

diff --git a/sys/dev/crypto/hifn/Makefile b/sys/dev/crypto/hifn/Makefile
index 0f9943d..e5ae49d 100644 (file)
--- a/sys/dev/crypto/hifn/Makefile
+++ b/sys/dev/crypto/hifn/Makefile
@@ -3,7 +3,7 @@
 KMOD   = hifn
 SRCS   = hifn7751.c opt_hifn.h
 SRCS   += device_if.h bus_if.h pci_if.h
-SRCS   += opt_bus.h cryptodev_if.h
+SRCS   += cryptodev_if.h
 
 .if !defined(BUILDING_WITH_KERNEL)
 opt_hifn.h:

diff --git a/sys/dev/crypto/padlock/Makefile b/sys/dev/crypto/padlock/Makefile
index 6230b73..450fd40 100644 (file)
--- a/sys/dev/crypto/padlock/Makefile
+++ b/sys/dev/crypto/padlock/Makefile
@@ -2,6 +2,6 @@
 
 KMOD=  padlock
 SRCS=  padlock.c padlock_cipher.c padlock_hash.c padlock_rng.c rng_harvest_$(MACHINE_ARCH).S
-SRCS   += device_if.h bus_if.h opt_bus.h cryptodev_if.h
+SRCS   += device_if.h bus_if.h cryptodev_if.h
 
 .include <bsd.kmod.mk>

diff --git a/sys/dev/crypto/safe/Makefile b/sys/dev/crypto/safe/Makefile
index 541c6ea..148c30f 100644 (file)
--- a/sys/dev/crypto/safe/Makefile
+++ b/sys/dev/crypto/safe/Makefile
@@ -29,7 +29,7 @@
 KMOD   = safe
 SRCS   = safe.c opt_safe.h
 SRCS   += device_if.h bus_if.h pci_if.h
-SRCS   += opt_bus.h cryptodev_if.h
+SRCS   += cryptodev_if.h
 
 .if !defined(BUILDING_WITH_KERNEL)
 opt_safe.h:

diff --git a/sys/dev/crypto/ubsec/Makefile b/sys/dev/crypto/ubsec/Makefile
index 1f7b536..b869324 100644 (file)
--- a/sys/dev/crypto/ubsec/Makefile
+++ b/sys/dev/crypto/ubsec/Makefile
@@ -3,7 +3,7 @@
 KMOD   = ubsec
 SRCS   = ubsec.c opt_ubsec.h
 SRCS   += device_if.h bus_if.h pci_if.h
-SRCS   += opt_bus.h cryptodev_if.h
+SRCS   += cryptodev_if.h
 
 .if !defined(BUILDING_WITH_KERNEL)
 opt_ubsec.h:

diff --git a/sys/dev/misc/ecc/Makefile b/sys/dev/misc/ecc/Makefile
index 986d411..8688134 100644 (file)
--- a/sys/dev/misc/ecc/Makefile
+++ b/sys/dev/misc/ecc/Makefile
@@ -1,7 +1,7 @@
 KMOD = ecc
 SRCS = ecc_amd8000.c ecc_e31200.c ecc_x3400.c
 SRCS += device_if.h bus_if.h pci_if.h pcib_if.h
-SRCS += opt_bus.h opt_pci.h
+SRCS += opt_pci.h
 MFILES = kern/device_if.m kern/bus_if.m bus/pci/pci_if.m bus/pci/pcib_if.m
 
 .include <bsd.kmod.mk>

diff --git a/sys/platform/pc32/i386/autoconf.c b/sys/platform/pc32/i386/autoconf.c
index 47280af..a381606 100644 (file)
--- a/sys/platform/pc32/i386/autoconf.c
+++ b/sys/platform/pc32/i386/autoconf.c
@@ -50,7 +50,6 @@
 #include "opt_cd9660.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"
-#include "opt_bus.h"
 #include "opt_rootdevname.h"
 
 #include "use_isa.h"

diff --git a/sys/platform/pc32/i386/mp_clock.c b/sys/platform/pc32/i386/mp_clock.c
index 2e17f61..f217085 100644 (file)
--- a/sys/platform/pc32/i386/mp_clock.c
+++ b/sys/platform/pc32/i386/mp_clock.c
@@ -32,8 +32,6 @@
  * $FreeBSD: src/sys/i386/i386/mp_clock.c,v 1.4.2.2 2000/09/30 02:49:32 ps Exp $
  */
 
-/* #include "opt_bus.h" */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>

diff --git a/sys/platform/pc64/x86_64/autoconf.c b/sys/platform/pc64/x86_64/autoconf.c
index e804b48..9a42bd5 100644 (file)
--- a/sys/platform/pc64/x86_64/autoconf.c
+++ b/sys/platform/pc64/x86_64/autoconf.c
@@ -51,7 +51,6 @@
 #include "opt_cd9660.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"
-#include "opt_bus.h"
 #include "opt_rootdevname.h"
 
 #include "use_isa.h"

diff --git a/sys/platform/vkernel/i386/autoconf.c b/sys/platform/vkernel/i386/autoconf.c
index d5d2808..070ae15 100644 (file)
--- a/sys/platform/vkernel/i386/autoconf.c
+++ b/sys/platform/vkernel/i386/autoconf.c
@@ -50,7 +50,6 @@
 #include "opt_cd9660.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"
-#include "opt_bus.h"
 #include "opt_rootdevname.h"
 
 #include "use_isa.h"

diff --git a/sys/platform/vkernel64/x86_64/autoconf.c b/sys/platform/vkernel64/x86_64/autoconf.c
index 4319ede..b3ff439 100644 (file)
--- a/sys/platform/vkernel64/x86_64/autoconf.c
+++ b/sys/platform/vkernel64/x86_64/autoconf.c
@@ -51,7 +51,6 @@
 #include "opt_cd9660.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"
-#include "opt_bus.h"
 #include "opt_rootdevname.h"
 
 #include "use_isa.h"