summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 67726159419..6bb982492da 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.461 2018/08/25 20:31:31 jcs Exp $
+# $OpenBSD: GENERIC,v 1.462 2018/08/27 19:32:48 jcs Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -419,7 +419,6 @@ pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI
#trm* at pci? # Tekram DC-3x5U SCSI Controllers
vmwpvs* at pci? # VMware ParaVirtual SCSI
nvme* at pci? # NVMe controllers
-bwfm* at pci? # Broadcom FullMAC
scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
@@ -546,6 +545,7 @@ pgt* at cardbus? # Prism54 (only full-mac varients)
malo* at pci? # Marvell Libertas
malo* at cardbus? # Marvell Libertas
malo* at pcmcia? # Marvell 88W8385
+bwfm* at pci? # Broadcom FullMAC
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index cad3743f484..40dc421cf45 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.836 2018/08/22 15:38:46 mpi Exp $
+# $OpenBSD: GENERIC,v 1.837 2018/08/27 19:32:48 jcs Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -471,7 +471,6 @@ uha* at eisa? # UltraStor 24f SCSI controllers
wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
#wds1 at isa? port 0x358 irq 11 drq 5
vmwpvs* at pci? # VMware ParaVirtual SCSI
-bwfm* at pci? # Broadcom FullMAC
scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
@@ -628,6 +627,7 @@ malo* at pci? # Marvell Libertas
malo* at cardbus? # Marvell Libertas
malo* at pcmcia? # Marvell 88W8385
mbg* at pci? # Meinberg Funkuhren radio clocks
+bwfm* at pci? # Broadcom FullMAC
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs