summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2011-04-03 12:32:06 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2011-04-03 12:32:06 +0000
commitf6afcae6ee3302976985e628d2a6f3354530553b (patch)
tree8b3329b79f2bc22ea36fe5cab34f03ff2c8a5eda
parent6922c52247a4cbe8de3e9e223b248a098de83e76 (diff)
Re-enable bce(4) now that it is fixed.
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 2414041d3f6..0716bf92f79 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.314 2011/03/24 10:25:20 robert Exp $
+# $OpenBSD: GENERIC,v 1.315 2011/04/03 12:32:05 claudio Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -469,7 +469,7 @@ xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
thtc* at pci? # Tehuti Networks 10Gb ethernet
tht* at thtc?
gem* at pci? # Sun 'gem' ethernet
-#bce* at pci? # Broadcom BCM4401
+bce* at pci? # Broadcom BCM4401
vic* at pci? # VMware VMXnet virtual interface
et* at pci? # Agere/LSI ET1310
age* at pci? # Attansic L1 Ethernet
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index b9367cc4d53..9d93aeec690 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.115 2010/08/04 21:44:41 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.116 2011/04/03 12:32:05 claudio Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -287,7 +287,7 @@ hme* at pci? # Sun Happy Meal
vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
-#bce* at pci? # Broadcom BCM4401
+bce* at pci? # Broadcom BCM4401
vic* at pci? # VMware VMXnet virtual interface
et* at pci? # Agere/LSI ET1310
age* at pci? # Attansic L1 Ethernet
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d0a9c56f60b..f746cb75a06 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.710 2011/03/28 15:24:54 claudio Exp $
+# $OpenBSD: GENERIC,v 1.711 2011/04/03 12:32:05 claudio Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -622,7 +622,7 @@ re* at cardbus? # Realtek 8169/8169S/8110S
stge* at pci? # Sundance TC9021 GigE
lge* at pci? # Level1 LXT1001 GigE
hme* at pci? # Sun Happy Meal
-#bce* at pci? # Broadcom BCM4401
+bce* at pci? # Broadcom BCM4401
vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
musycc* at pci? # Conexant HDLC controller
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index dccb068c005..262100a11e7 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.184 2011/03/28 15:24:54 claudio Exp $
+# $OpenBSD: RAMDISK_CD,v 1.185 2011/04/03 12:32:05 claudio Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -365,7 +365,7 @@ bnx* at pci? # Broadcom BCM5706/5708 GigE
lge* at pci? # Level1 LXT1001 GigE
mtd* at pci? # Myson MTD803
hme* at pci? # Sun Happy Meal
-#bce* at pci? # Broadcom BCM4401
+bce* at pci? # Broadcom BCM4401
vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet