summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2012-07-12 08:09:02 +0000
committerjsg <jsg@openbsd.org>2012-07-12 08:09:02 +0000
commit334fb9300082dad1f82e8ef830a9efdb82325a22 (patch)
tree475e6416445bda5fa65666ae9ebc6906a70e9c69
parentmove a bit of stuff around (diff)
downloadwireguard-openbsd-334fb9300082dad1f82e8ef830a9efdb82325a22.tar.xz
wireguard-openbsd-334fb9300082dad1f82e8ef830a9efdb82325a22.zip
Chips which include a card reader (JMC251/JMC261) work as well.
with tweaks from and ok jmc@
-rw-r--r--share/man/man4/jme.410
-rw-r--r--share/man/man4/pci.46
2 files changed, 10 insertions, 6 deletions
diff --git a/share/man/man4/jme.4 b/share/man/man4/jme.4
index 05ba0eafc1d..365862db66d 100644
--- a/share/man/man4/jme.4
+++ b/share/man/man4/jme.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: jme.4,v 1.3 2009/06/05 06:05:06 naddy Exp $
+.\" $OpenBSD: jme.4,v 1.4 2012/07/12 08:09:02 jsg Exp $
.\"
.\" Copyright (c) 2008 Jonathan Gray <jsg@openbsd.org>
.\"
@@ -14,12 +14,12 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: June 5 2009 $
+.Dd $Mdocdate: July 12 2012 $
.Dt JME 4
.Os
.Sh NAME
.Nm jme
-.Nd JMicron JMC250/JMC260 10/100/Gigabit Ethernet device
+.Nd JMicron JMC25x/JMC26x 10/100/Gigabit Ethernet device
.Sh SYNOPSIS
.Cd "jme* at pci?"
.Cd "jmphy* at mii?"
@@ -28,6 +28,10 @@ The
.Nm
driver supports PCI Express Ethernet adapters based on the JMicron
JMC260 10/100 and JMC250 10/100/Gigabit Ethernet chips.
+The Ethernet portion of the JMC261 10/100 and
+JMC251 10/100/Gigabit chips,
+which incorporate a card reader,
+is also supported.
.Pp
The
.Nm
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 1627984b00d..1d21c3f0476 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pci.4,v 1.306 2012/05/28 05:34:41 jmc Exp $
+.\" $OpenBSD: pci.4,v 1.307 2012/07/12 08:09:02 jsg Exp $
.\" $NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
.\"
.\" Copyright (c) 2000 Theo de Raadt. All rights reserved.
@@ -31,7 +31,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 28 2012 $
+.Dd $Mdocdate: July 12 2012 $
.Dt PCI 4
.Os
.Sh NAME
@@ -211,7 +211,7 @@ Intel 82598/82599 PCI Express 10Gb Ethernet device
.It Xr ixgb 4
Intel PRO/10GbE 10Gb Ethernet device
.It Xr jme 4
-JMicron JMC250/JMC260 10/100/Gigabit Ethernet device
+JMicron JMC25x/JMC26x 10/100/Gigabit Ethernet device
.It Xr lge 4
Level 1 LXT1001 NetCellerator PCI Gigabit Ethernet device
.It Xr lii 4