summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-05-01 00:39:51 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-05-01 00:39:51 +0000
commite17aae54953465ff23e68f603e338e053c0541f6 (patch)
tree8093ec8c9c9924f7e6afbd546db16ed4ac02a475 /sys
parenta86ae40b0df0a0e4bd0c3d2ed5e8240a0f9bdcd8 (diff)
add commented out entries for the Neterion Xframe-I 10Gb ethernet adapters.
the driver is currently untested.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD3
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 792020cdc7e..82804a3e39d 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.124 2006/04/30 21:59:49 brad Exp $
+# $OpenBSD: GENERIC,v 1.125 2006/05/01 00:39:50 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -339,6 +339,7 @@ vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
musycc* at pci? # Conexant HDLC controller
art* at musycc? # Accoom Artery E1/T1 cards
+#xge* at pci? # Neterion Xframe-I 10Gb ethernet
# Wireless network cards
ath* at pci? # Atheros AR5k (802.11a/b/g)
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 4d00a21acb0..0660aeba381 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.50 2006/04/30 21:59:50 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.51 2006/05/01 00:39:50 brad Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -244,6 +244,7 @@ stge* at pci? # Sundance TC9021 GigE
hme* at pci? # Sun Happy Meal
vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
+#xge* at pci? # Neterion Xframe-I 10Gb ethernet
# Wireless network cards
ath* at pci? # Atheros AR5k (802.11a/b/g)
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8327dca2bd5..007a29fa2a3 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.487 2006/04/30 20:06:24 brad Exp $
+# $OpenBSD: GENERIC,v 1.488 2006/05/01 00:39:47 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -483,6 +483,7 @@ vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
musycc* at pci? # Conexant HDLC controller
art* at musycc? # Accoom Artery E1/T1 cards
+#xge* at pci? # Neterion Xframe-I 10Gb ethernet
# Wireless network cards
ath* at pci? # Atheros AR5k (802.11a/b/g)
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index b26b1ede48a..e92e05d2039 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.116 2006/04/30 20:06:24 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.117 2006/05/01 00:39:47 brad Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -336,6 +336,7 @@ hme* at pci? # Sun Happy Meal
bce* at pci? # Broadcom BCM4401
vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
+#xge* at pci? # Neterion Xframe-I 10Gb ethernet
# Wireless network cards
ath* at pci? # Atheros AR5k (802.11a/b/g)