1c1
< # $FreeBSD: head/sys/conf/files 301188 2016-06-02 04:42:45Z adrian $
---
> # $FreeBSD: head/sys/conf/files 301410 2016-06-04 19:53:47Z landonf $
12c12
< bhnd_nvram_map.h optional bhndbus | bhnd \
---
> bhnd_nvram_map.h optional bhnd \
17c17
< bhnd_nvram_map_data.h optional bhndbus | bhnd \
---
> bhnd_nvram_map_data.h optional bhnd \
1130,1151c1130,1157
< dev/bhnd/bhnd.c optional bhndbus | bhnd
< dev/bhnd/bhnd_subr.c optional bhndbus | bhnd
< dev/bhnd/bhnd_bus_if.m optional bhndbus | bhnd
< dev/bhnd/bhndb/bhnd_bhndb.c optional bhndbus | bhndb
< dev/bhnd/bhndb/bhndb.c optional bhndbus | bhndb
< dev/bhnd/bhndb/bhndb_bus_if.m optional bhndbus | bhndb
< dev/bhnd/bhndb/bhndb_hwdata.c optional bhndbus | bhndb
< dev/bhnd/bhndb/bhndb_if.m optional bhndbus | bhndb
< dev/bhnd/bhndb/bhndb_pci.c optional bhndbus pci | bhndb pci
< dev/bhnd/bhndb/bhndb_pci_hwdata.c optional bhndbus pci | bhndb pci
< dev/bhnd/bhndb/bhndb_pci_sprom.c optional bhndbus pci | bhndb pci
< dev/bhnd/bhndb/bhndb_subr.c optional bhndbus pci | bhndb
< dev/bhnd/bcma/bcma.c optional bhndbus | bcma
< dev/bhnd/bcma/bcma_bhndb.c optional bhndbus | bcma bhndb
< dev/bhnd/bcma/bcma_erom.c optional bhndbus | bcma
< dev/bhnd/bcma/bcma_subr.c optional bhndbus | bcma
< dev/bhnd/cores/chipc/chipc.c optional bhndbus | bhnd
< dev/bhnd/cores/chipc/chipc_subr.c optional bhndbus | bhnd
< dev/bhnd/cores/chipc/bhnd_chipc_if.m optional bhndbus | bhnd
< dev/bhnd/cores/chipc/bhnd_sprom_chipc.c optional bhndbus | bhnd
< dev/bhnd/cores/pci/bhnd_pci.c optional bhndbus pci | bhnd pci
< dev/bhnd/cores/pci/bhnd_pci_hostb.c optional bhndbus pci | bhndb pci
---
> dev/bhnd/bhnd.c optional bhnd
> dev/bhnd/bhnd_nexus.c optional bhnd siba_nexus | \
> bhnd bcma_nexus
> dev/bhnd/bhnd_subr.c optional bhnd
> dev/bhnd/bhnd_bus_if.m optional bhnd
> dev/bhnd/bhndb/bhnd_bhndb.c optional bhndb bhnd
> dev/bhnd/bhndb/bhndb.c optional bhndb bhnd
> dev/bhnd/bhndb/bhndb_bus_if.m optional bhndb bhnd
> dev/bhnd/bhndb/bhndb_hwdata.c optional bhndb bhnd
> dev/bhnd/bhndb/bhndb_if.m optional bhndb bhnd
> dev/bhnd/bhndb/bhndb_pci.c optional bhndb bhnd pci
> dev/bhnd/bhndb/bhndb_pci_hwdata.c optional bhndb bhnd pci
> dev/bhnd/bhndb/bhndb_pci_sprom.c optional bhndb bhnd pci
> dev/bhnd/bhndb/bhndb_subr.c optional bhndb bhnd
> dev/bhnd/bcma/bcma.c optional bcma bhnd
> dev/bhnd/bcma/bcma_bhndb.c optional bcma bhnd bhndb
> dev/bhnd/bcma/bcma_erom.c optional bcma bhnd
> dev/bhnd/bcma/bcma_nexus.c optional bcma_nexus bcma bhnd
> dev/bhnd/bcma/bcma_subr.c optional bcma bhnd
> dev/bhnd/cores/chipc/chipc.c optional bhnd
> dev/bhnd/cores/chipc/chipc_cfi.c optional bhnd cfi
> dev/bhnd/cores/chipc/chipc_slicer.c optional bhnd cfi | bhnd spibus
> dev/bhnd/cores/chipc/chipc_spi.c optional bhnd spibus
> dev/bhnd/cores/chipc/chipc_subr.c optional bhnd
> dev/bhnd/cores/chipc/bhnd_chipc_if.m optional bhnd
> dev/bhnd/cores/chipc/bhnd_sprom_chipc.c optional bhnd
> dev/bhnd/cores/pci/bhnd_pci.c optional bhnd pci
> dev/bhnd/cores/pci/bhnd_pci_hostb.c optional bhndb bhnd pci
1153,1154c1159,1160
< dev/bhnd/cores/pcie2/bhnd_pcie2.c optional bhndbus pci | bhnd pci
< dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c optional bhndbus pci | bhndb pci
---
> dev/bhnd/cores/pcie2/bhnd_pcie2.c optional bhnd pci
> dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c optional bhndb bhnd pci
1156,1163c1162,1169
< dev/bhnd/nvram/bhnd_nvram_if.m optional bhndbus | bhnd
< dev/bhnd/nvram/bhnd_sprom.c optional bhndbus | bhnd
< dev/bhnd/nvram/bhnd_sprom_subr.c optional bhndbus | bhnd
< dev/bhnd/nvram/nvram_subr.c optional bhndbus | bhnd
< dev/bhnd/siba/siba.c optional bhndbus | siba
< dev/bhnd/siba/siba_bhndb.c optional bhndbus | siba bhndb
< dev/bhnd/siba/siba_nexus.c optional siba_nexus siba
< dev/bhnd/siba/siba_subr.c optional bhndbus | siba
---
> dev/bhnd/nvram/bhnd_nvram_if.m optional bhnd
> dev/bhnd/nvram/bhnd_sprom.c optional bhnd
> dev/bhnd/nvram/bhnd_sprom_subr.c optional bhnd
> dev/bhnd/nvram/nvram_subr.c optional bhnd
> dev/bhnd/siba/siba.c optional siba bhnd
> dev/bhnd/siba/siba_bhndb.c optional siba bhnd bhndb
> dev/bhnd/siba/siba_nexus.c optional siba_nexus siba bhnd
> dev/bhnd/siba/siba_subr.c optional siba bhnd
1185c1191
< dev/bwn/if_bwn_pci.c optional bwn pci bhnd | bwn pci bhndbus
---
> dev/bwn/if_bwn_pci.c optional bwn pci bhnd
1193c1199
< dev/bwn/bwn_mac.c optional bwn bhnd | bwn bhndbus
---
> dev/bwn/bwn_mac.c optional bwn bhnd
2493,2496c2499
< dev/siba/siba_cc.c optional siba_s5 !bhnd !bhndbus
< dev/siba/siba_core.c optional siba_s5 | siba_bwn pci
< dev/siba/siba_mips.c optional siba_s5 !bhnd !bhndbus
< dev/siba/siba_pcib.c optional siba_s5 pci !bhnd !bhndbus
---
> dev/siba/siba_core.c optional siba_bwn pci