summaryrefslogtreecommitdiff
path: root/sys/dev/mii
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-11-28 18:23:11 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-11-28 18:23:11 +0000
commit69aebf6d86b0fb1978a7fdd24bfb50ec9b3b4348 (patch)
tree880f282aa50acf0df5ad0bcd5af0f5bed8b65f5d /sys/dev/mii
parent68decb943600baec88c9ede2210b3ca6273d8523 (diff)
sync with new miidevs entries.
Diffstat (limited to 'sys/dev/mii')
-rw-r--r--sys/dev/mii/eephy.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index d24f10b97ae..49413c16de7 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephy.c,v 1.33 2006/10/02 04:09:20 brad Exp $ */
+/* $OpenBSD: eephy.c,v 1.34 2006/11/28 18:23:10 brad Exp $ */
/*
* Principal Author: Parag Patel
* Copyright (c) 2001
@@ -86,10 +86,6 @@ static const struct mii_phydesc eephys[] = {
MII_STR_MARVELL_E1000_3 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_4,
MII_STR_MARVELL_E1000_4 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_5,
- MII_STR_MARVELL_E1000_5 },
- { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_6,
- MII_STR_MARVELL_E1000_6 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000S,
MII_STR_MARVELL_E1000S },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1011,
@@ -98,16 +94,20 @@ static const struct mii_phydesc eephys[] = {
MII_STR_MARVELL_E1111 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1112,
MII_STR_MARVELL_E1112 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1116,
+ MII_STR_MARVELL_E1116 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1118,
+ MII_STR_MARVELL_E1118 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1149,
MII_STR_MARVELL_E1149 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E3082,
MII_STR_MARVELL_E3082 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_5,
+ MII_STR_xxMARVELL_E1000_5 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_6,
+ MII_STR_xxMARVELL_E1000_6 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_7,
MII_STR_xxMARVELL_E1000_7 },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_8,
- MII_STR_xxMARVELL_E1000_8 },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_9,
- MII_STR_xxMARVELL_E1000_9 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1111,
MII_STR_xxMARVELL_E1111 },