summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/man/man4/sk.46
-rw-r--r--sys/dev/pci/if_msk.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index a1fd297206b..473cb5c374e 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sk.4,v 1.43 2006/08/30 22:56:05 jmc Exp $
+.\" $OpenBSD: sk.4,v 1.44 2006/09/22 13:06:15 brad Exp $
.\"
.\" Copyright (c) 1997, 1998, 1999
.\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -109,6 +109,10 @@ Marvell Yukon 88E8052, copper adapter
.It
Marvell Yukon 88E8053, copper adapter
.It
+Marvell Yukon 88E8055, copper adapter
+.It
+Marvell Yukon 88E8056, copper adapter
+.It
SK-9E21 1000Base-T single port, copper adapter
.It
SK-9E22 1000Base-T dual port, copper adapter
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index e30c959807f..b3d9a29c09f 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_msk.c,v 1.17 2006/09/16 01:20:26 jsg Exp $ */
+/* $OpenBSD: if_msk.c,v 1.18 2006/09/22 13:06:15 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -191,6 +191,8 @@ const struct pci_matchid mskc_devices[] = {
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8050 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8052 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8053 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8055 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8056 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021CU },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021X },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022CU },
@@ -199,7 +201,6 @@ const struct pci_matchid mskc_devices[] = {
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061X },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062CU },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062X },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_3 },
{ PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx },
{ PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx }
};