summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-04 21:44:42 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-04 21:44:42 +0000
commitc15d5e90744679e0f7d8f703c118337e61d8a19b (patch)
tree7b0b2d49ccba40650e5b654da77686010eb22feb /sys/arch
parentcfcb860b021347053570c25684b3ec7aff339622 (diff)
Disable bce(4) because it can only access 1GB of memory and developers
who have the device (only found in laptops) refuse to realize it is their own problem and should dig into the code and fix it.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 850a956aca5..d3eea3ff73a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.297 2010/08/02 14:13:23 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.298 2010/08/04 21:44:41 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -466,7 +466,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 23ba4f17899..b9367cc4d53 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.114 2010/07/03 03:59:16 krw Exp $
+# $OpenBSD: RAMDISK_CD,v 1.115 2010/08/04 21:44:41 deraadt 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