summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2006-08-14 16:22:40 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2006-08-14 16:22:40 +0000
commitb42eb98d5f86ab05a2f1f67c7e45f8f3a80102a8 (patch)
treebb692fa1d70fe32e3b9ec3407fe1fa8976f6e6ec
parent071a28f87c3e1f48e28e2f87e748d7f385410878 (diff)
Enable bnx because we now can run traffic.
ok deraadt
-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 976cb25642c..1caac9c52db 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.150 2006/08/14 08:34:21 jsg Exp $
+# $OpenBSD: GENERIC,v 1.151 2006/08/14 16:22:39 marco Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -344,7 +344,7 @@ ixgb* at pci? # Intel Pro/10Gb ethernet
txp* at pci? # 3com 3CR990
#nge* at pci? # NS DP83820/DP83821 GigE
bge* at pci? # Broadcom BCM57xx (aka Tigon3)
-#bnx* at pci? # Broadcom BCM5706/5708 GigE
+bnx* at pci? # Broadcom BCM5706/5708 GigE
re* at pci? # Realtek 8169/8169S/8110S
stge* at pci? # Sundance TC9021 GigE
#lge* at pci? # Level1 LXT1001 GigE
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 5ac1641e931..fe789b49388 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.519 2006/08/14 08:30:22 jsg Exp $
+# $OpenBSD: GENERIC,v 1.520 2006/08/14 16:22:39 marco Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -487,7 +487,7 @@ ixgb* at pci? # Intel Pro/10Gb ethernet
txp* at pci? # 3com 3CR990
nge* at pci? # NS DP83820/DP83821 GigE
bge* at pci? # Broadcom BCM57xx (aka Tigon3)
-#bnx* at pci? # Broadcom BCM5706/5708 GigE
+bnx* at pci? # Broadcom BCM5706/5708 GigE
re* at pci? # Realtek 8169/8169S/8110S
re* at cardbus? # Realtek 8169/8169S/8110S
stge* at pci? # Sundance TC9021 GigE