summaryrefslogtreecommitdiff
path: root/sys/dev/mii
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2006-01-15 03:06:22 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2006-01-15 03:06:22 +0000
commit394139a5e9b4f02a13431fe1966cf70bb6c1c113 (patch)
tree0e1ba088ad864ab343f0bab742d774419fcb6b83 /sys/dev/mii
parent8323f2d2aee814633f47b72318609b28043182c1 (diff)
The RCJ part of 88E1111-RCJ is the package the ic comes in which
may not be always correct for the id so don't mention it.
Diffstat (limited to 'sys/dev/mii')
-rw-r--r--sys/dev/mii/eephy.c6
-rw-r--r--sys/dev/mii/miidevs4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index 4b9c5949495..fd708f6d6c3 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephy.c,v 1.22 2005/11/06 07:16:47 brad Exp $ */
+/* $OpenBSD: eephy.c,v 1.23 2006/01/15 03:06:21 jsg Exp $ */
/*
* Principal Author: Parag Patel
* Copyright (c) 2001
@@ -97,8 +97,8 @@ static const struct mii_phydesc eephys[] = {
MII_STR_MARVELL_E1000_5 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_6,
MII_STR_MARVELL_E1000_6 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1111RCJ,
- MII_STR_MARVELL_E1111RCJ },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1111,
+ MII_STR_MARVELL_E1111 },
{ 0, 0,
NULL },
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 971ee8f6134..343875306cb 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$OpenBSD: miidevs,v 1.68 2005/12/08 00:45:34 brad Exp $
+$OpenBSD: miidevs,v 1.69 2006/01/15 03:06:21 jsg Exp $
/* $NetBSD: miidevs,v 1.3 1998/11/05 03:43:43 thorpej Exp $ */
/*-
@@ -162,7 +162,7 @@ model MARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY
model MARVELL E1000_4 0x0004 Marvell 88E1000S Gigabit PHY
model MARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY
model MARVELL E1000_6 0x0006 Marvell 88E1000 Gigabit PHY
-model MARVELL E1111RCJ 0x000c Marvell 88E1111-RCJ Gigabit PHY
+model MARVELL E1111 0x000c Marvell 88E1111 Gigabit PHY
model xxMARVELL E1000_2 0x0002 Marvell 88E1000 Gigabit PHY
model xxMARVELL E1000_3 0x0003 Marvell 88E1000 Gigabit PHY
model xxMARVELL E1000_5 0x0005 Marvell 88E1000 Gigabit PHY