summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2006-12-12 20:48:12 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2006-12-12 20:48:12 +0000
commitec3c0275935bdfae8fa257ec18b5a571dfa98a5f (patch)
treed8c062cd41a0a11dc6b85f0708409e94dfcf632a
parent84061ba71cf14bdd9498f7ec9523436d9fe0b8bb (diff)
Clarifying a few pcidevs entry names based on names found
in a much more recent Marvell Linux sk98lin driver. From brad@. ok me and kettenis (via mglocker)
-rw-r--r--sys/dev/pci/if_msk.c14
-rw-r--r--sys/dev/pci/pcidevs16
2 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 7c33369e42c..d0a1477c7a5 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.28 2006/12/08 02:13:36 gwk Exp $ */
+/* $OpenBSD: if_msk.c,v 1.29 2006/12/12 20:48:11 mk Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -188,15 +188,15 @@ const struct pci_matchid mskc_devices[] = {
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560SX },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_1 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_2 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_3 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_4 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_5 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_6 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_7 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C032 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C033 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C034 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C036 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C042 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8038 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8039 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8050 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8052 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8053 },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index f7593f2a404..51126517e51 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1200 2006/12/10 01:07:49 dim Exp $
+$OpenBSD: pcidevs,v 1.1201 2006/12/12 20:48:11 mk Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -2392,18 +2392,18 @@ product MARVELL YUKONII_8062X 0x4347 Yukon-II 88E8062X
product MARVELL YUKON_8035 0x4350 Yukon 88E8035
product MARVELL YUKON_8036 0x4351 Yukon 88E8036
product MARVELL YUKON_8038 0x4352 Yukon 88E8038
-product MARVELL YUKON_1 0x4353 Yukon
-product MARVELL YUKON_2 0x4356 Yukon
+product MARVELL YUKON_8039 0x4353 Yukon 88E8039
+product MARVELL YUKON_C033 0x4356 Yukon 88EC033
product MARVELL YUKON_8052 0x4360 Yukon 88E8052
product MARVELL YUKON_8050 0x4361 Yukon 88E8050
product MARVELL YUKON_8053 0x4362 Yukon 88E8053
product MARVELL YUKON_8055 0x4363 Yukon 88E8055
product MARVELL YUKON_8056 0x4364 Yukon 88E8056
-product MARVELL YUKON_3 0x4365 Yukon
-product MARVELL YUKON_4 0x4366 Yukon
-product MARVELL YUKON_5 0x4367 Yukon
-product MARVELL YUKON_6 0x4368 Yukon
-product MARVELL YUKON_7 0x4369 Yukon
+product MARVELL YUKON_1 0x4365 Yukon
+product MARVELL YUKON_C036 0x4366 Yukon 88EC036
+product MARVELL YUKON_C032 0x4367 Yukon 88EC032
+product MARVELL YUKON_C034 0x4368 Yukon 88EC034
+product MARVELL YUKON_C042 0x4369 Yukon 88EC042
product MARVELL YUKON_BELKIN 0x5005 Yukon (Belkin F5D5005)
product MARVELL 88SX5040 0x5040 88SX5040 SATA
product MARVELL 88SX5041 0x5041 88SX5041 SATA