mention the Xframe-II as well.

5 files changed, 11 insertions, 12 deletions

diff --git a/share/man/man4/xge.4 b/share/man/man4/xge.4
index aaeddf84597..ce3d653ec55 100644
--- a/share/man/man4/xge.4
+++ b/share/man/man4/xge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xge.4,v 1.2 2006/05/01 14:37:28 jmc Exp $
+.\"	$OpenBSD: xge.4,v 1.3 2006/05/13 04:46:15 brad Exp $
 .\"	$NetBSD: xge.4,v 1.2 2005/09/10 22:48:09 wiz Exp $
 .\"
 .\" Copyright (c) 2005, SUNET, Swedish University Computer Network.
@@ -38,14 +38,13 @@
 .Os
 .Sh NAME
 .Nm xge
-.Nd Neterion Xframe-I Ten Gigabit Ethernet driver
+.Nd Neterion Xframe-I/II Ten Gigabit Ethernet driver
 .Sh SYNOPSIS
 .Cd "xge* at pci? dev ? function ?"
 .Sh DESCRIPTION
 The
 .Nm
-device driver supports the Neterion Xframe-I LR Ethernet adapter,
-which uses a single mode fiber (1310nm) interface.
+device driver supports the Neterion Xframe-I and Xframe-II controller chips.
 .Pp
 The Xframe supports IPv4/TCP/UDP checksumming in hardware, as well
 as hardvare VLAN handling.
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 800d51067c4..05d73e9b631 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.127 2006/05/08 22:51:18 gwk Exp $
+#	$OpenBSD: GENERIC,v 1.128 2006/05/13 04:46:15 brad Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -340,7 +340,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
+#xge*	at pci?				# Neterion Xframe-I/II 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 0660aeba381..6f30f3382d8 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.51 2006/05/01 00:39:50 brad Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.52 2006/05/13 04:46:15 brad Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -244,7 +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
+#xge*	at pci?			# Neterion Xframe-I/II 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 fb77825c03a..4a83f7ce654 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.489 2006/05/08 04:15:02 brad Exp $
+#	$OpenBSD: GENERIC,v 1.490 2006/05/13 04:46:15 brad Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -483,7 +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
+#xge*	at pci?				# Neterion Xframe-I/II 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 e92e05d2039..17dbaafc07a 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.117 2006/05/01 00:39:47 brad Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.118 2006/05/13 04:46:15 brad Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -336,7 +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
+#xge*	at pci?				# Neterion Xframe-I/II 10Gb ethernet
 
 # Wireless network cards
 ath*	at pci?				# Atheros AR5k (802.11a/b/g)