Index: head/sys/modules/bhnd/Makefile =================================================================== --- head/sys/modules/bhnd/Makefile (revision 308106) +++ head/sys/modules/bhnd/Makefile (revision 308107) @@ -1,49 +1,51 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../dev/bhnd .PATH: ${.CURDIR}/../../dev/bhnd/cores/chipc .PATH: ${.CURDIR}/../../dev/bhnd/cores/chipc/pwrctl .PATH: ${.CURDIR}/../../dev/bhnd/cores/pmu .PATH: ${.CURDIR}/../../dev/bhnd/nvram KMOD= bhnd SRCS= bhnd.c bhnd_subr.c SRCS+= bhnd_bus_if.c bhnd_bus_if.h SRCS+= bhnd_erom.c SRCS+= bhnd_erom_if.c bhnd_erom_if.h # ChipCommon SRCS+= chipc.c chipc_subr.c SRCS+= bhnd_sprom_chipc.c \ bhnd_pmu_chipc.c \ bhnd_pwrctl.c bhnd_pwrctl_subr.c SRCS+= bhnd_chipc_if.c bhnd_chipc_if.h # PMU SRCS+= bhnd_pmu.c \ bhnd_pmu_core.c \ bhnd_pmu_subr.c SRCS+= bhnd_pmu_if.c bhnd_pmu_if.h # NVRAM/SPROM SRCS+= bhnd_nvram.c \ bhnd_nvram_parser.c \ bhnd_sprom.c \ bhnd_sprom_parser.c SRCS+= bhnd_nvram_common.c SRCS+= bhnd_nvram_map.h bhnd_nvram_map_data.h SRCS+= bhnd_nvram_if.c bhnd_nvram_if.h SRCS+= device_if.h bus_if.h +SRCS+= opt_global.h + SUBDIR= bcma \ bcma_bhndb \ bhndb \ bhndb_pci \ cores \ siba \ siba_bhndb .include .include Index: head/sys/modules/bhnd/bcma/Makefile =================================================================== --- head/sys/modules/bhnd/bcma/Makefile (revision 308106) +++ head/sys/modules/bhnd/bcma/Makefile (revision 308107) @@ -1,11 +1,11 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../dev/bhnd/bcma KMOD= bcma SRCS= bcma.c bcma_subr.c bcma_erom.c SRCS+= device_if.h bus_if.h -SRCS+= bhnd_bus_if.h bhnd_erom_if.h bhnd_pmu_if.h +SRCS+= bhnd_bus_if.h bhnd_erom_if.h bhnd_pmu_if.h opt_global.h .include Index: head/sys/modules/bhnd/bcma_bhndb/Makefile =================================================================== --- head/sys/modules/bhnd/bcma_bhndb/Makefile (revision 308106) +++ head/sys/modules/bhnd/bcma_bhndb/Makefile (revision 308107) @@ -1,12 +1,12 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../dev/bhnd/bcma KMOD= bcma_bhndb SRCS= bcma_bhndb.c SRCS+= bhnd_bus_if.h bhnd_erom_if.h SRCS+= bhndb_bus_if.h bhndb_if.h -SRCS+= device_if.h bus_if.h +SRCS+= device_if.h bus_if.h opt_global.h .include Index: head/sys/modules/bhnd/bhndb/Makefile =================================================================== --- head/sys/modules/bhnd/bhndb/Makefile (revision 308106) +++ head/sys/modules/bhnd/bhndb/Makefile (revision 308107) @@ -1,17 +1,17 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../dev/bhnd/bhndb KMOD= bhndb SRCS= bhndb.c bhndb_subr.c bhndb_hwdata.c \ bhnd_bhndb.c \ bhndb_bus_if.c bhndb_bus_if.h \ bhndb_if.c bhndb_if.h SRCS+= bhnd_bus_if.h \ bhnd_chipc_if.h \ bhnd_erom_if.h \ bhnd_nvram_if.h -SRCS+= device_if.h bus_if.h pci_if.h +SRCS+= device_if.h bus_if.h pci_if.h opt_global.h .include Index: head/sys/modules/bhnd/bhndb_pci/Makefile =================================================================== --- head/sys/modules/bhnd/bhndb_pci/Makefile (revision 308106) +++ head/sys/modules/bhnd/bhndb_pci/Makefile (revision 308107) @@ -1,13 +1,13 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../dev/bhnd/bhndb KMOD= bhndb_pci SRCS= bhndb_pci.c bhndb_pci_hwdata.c \ bhndb_pci_sprom.c SRCS+= bhnd_bus_if.h bhndb_bus_if.h bhndb_if.h SRCS+= bhnd_nvram_if.h -SRCS+= device_if.h bus_if.h pci_if.h +SRCS+= device_if.h bus_if.h pci_if.h opt_global.h .include Index: head/sys/modules/bhnd/cores/bhnd_pci/Makefile =================================================================== --- head/sys/modules/bhnd/cores/bhnd_pci/Makefile (revision 308106) +++ head/sys/modules/bhnd/cores/bhnd_pci/Makefile (revision 308107) @@ -1,10 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci .PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pcie2 KMOD= bhnd_pci SRCS= bhnd_pci.c bhnd_pcie2.c -SRCS+= device_if.h bus_if.h bhnd_bus_if.h +SRCS+= device_if.h bus_if.h bhnd_bus_if.h opt_global.h .include Index: head/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile =================================================================== --- head/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile (revision 308106) +++ head/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile (revision 308107) @@ -1,11 +1,11 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci .PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pcie2 KMOD= bhnd_pci_hostb SRCS= bhnd_pci_hostb.c bhnd_pcie2_hostb.c SRCS+= device_if.h bus_if.h pci_if.h \ - bhnd_bus_if.h bhnd_chipc_if.h + bhnd_bus_if.h bhnd_chipc_if.h opt_global.h .include Index: head/sys/modules/bhnd/cores/bhnd_pcib/Makefile =================================================================== --- head/sys/modules/bhnd/cores/bhnd_pcib/Makefile (revision 308106) +++ head/sys/modules/bhnd/cores/bhnd_pcib/Makefile (revision 308107) @@ -1,11 +1,11 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci .PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pcie2 KMOD= bhnd_pcib SRCS= bhnd_pcib.c bhnd_pcie2b.c SRCS+= device_if.h bus_if.h pci_if.h \ - bhnd_bus_if.h + bhnd_bus_if.h opt_global.h .include Index: head/sys/modules/bhnd/siba/Makefile =================================================================== --- head/sys/modules/bhnd/siba/Makefile (revision 308106) +++ head/sys/modules/bhnd/siba/Makefile (revision 308107) @@ -1,12 +1,12 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../dev/bhnd/siba KMOD= siba SRCS= siba.c siba_subr.c \ siba_erom.c SRCS+= device_if.h bus_if.h -SRCS+= bhnd_bus_if.h bhnd_erom_if.h bhnd_pmu_if.h +SRCS+= bhnd_bus_if.h bhnd_erom_if.h bhnd_pmu_if.h opt_global.h .include Index: head/sys/modules/bhnd/siba_bhndb/Makefile =================================================================== --- head/sys/modules/bhnd/siba_bhndb/Makefile (revision 308106) +++ head/sys/modules/bhnd/siba_bhndb/Makefile (revision 308107) @@ -1,12 +1,12 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../dev/bhnd/siba KMOD= siba_bhndb SRCS= siba_bhndb.c SRCS+= bhnd_bus_if.h bhnd_erom_if.h SRCS+= bhndb_bus_if.h bhndb_if.h -SRCS+= device_if.h bus_if.h +SRCS+= device_if.h bus_if.h opt_global.h .include