summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD5
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD5
4 files changed, 12 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 3b2361bb60c..e7376a9bbfa 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.143 2006/06/26 03:36:30 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.144 2006/06/26 06:31:31 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -339,7 +339,8 @@ em* at pci? # Intel Pro/1000 ethernet
ixgb* at pci? # Intel Pro/10Gb ethernet
txp* at pci? # 3com 3CR990
#nge* at pci? # NS DP83820/DP83821 GigE
-bge* at pci? # Broadcom BCM570x (aka Tigon3)
+bge* at pci? # Broadcom BCM57xx (aka Tigon3)
+#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/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 174528a816c..91731aeae4e 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.58 2006/06/15 22:25:37 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.59 2006/06/26 06:31:31 brad Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -237,7 +237,8 @@ ixgb* at pci? # Intel Pro/10Gb ethernet
#txp* at pci? # 3com 3CR990
#nge* at pci? # NS DP83820/DP83821 GigE
#sf* at pci? # Adaptec AIC-6915 ethernet
-bge* at pci? # Broadcom BCM570x (aka Tigon3)
+bge* at pci? # Broadcom BCM57xx (aka Tigon3)
+#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
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f009d5b12b2..0969091f800 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.507 2006/06/16 22:47:54 niallo Exp $
+# $OpenBSD: GENERIC,v 1.508 2006/06/26 06:31:31 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -481,7 +481,8 @@ em* at pci? # Intel Pro/1000 ethernet
ixgb* at pci? # Intel Pro/10Gb ethernet
txp* at pci? # 3com 3CR990
nge* at pci? # NS DP83820/DP83821 GigE
-bge* at pci? # Broadcom BCM570x (aka Tigon3)
+bge* at pci? # Broadcom BCM57xx (aka Tigon3)
+#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
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index c0caaa8a7df..bd3f1eb9d8b 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.123 2006/06/15 22:25:37 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.124 2006/06/26 06:31:31 brad Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -331,7 +331,8 @@ nge* at pci? # NS DP83820/DP83821 GigE
re* at pci? # Realtek 8169/8169S/8110S
re* at cardbus? # Realtek 8169/8169S/8110S
stge* at pci? # Sundance TC9021 GigE
-bge* at pci? # Broadcom BCM570x (aka Tigon3)
+bge* at pci? # Broadcom BCM57xx (aka Tigon3)
+#bnx* at pci? # Broadcom BCM5706/5708 GigE
lge* at pci? # Level1 LXT1001 GigE
mtd* at pci? # Myson MTD803
hme* at pci? # Sun Happy Meal