Sync.

1 files changed, 42 insertions, 42 deletions

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 228b5a33fb7..e7c51f8a33e 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.724 2004/04/17 17:52:03 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.725 2004/05/04 05:59:35 henric Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -2748,103 +2748,103 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542,
-	    "PRO/1000 (PWLA8490)",
+	    "PRO/1000 (82542)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_SC,
-	    "PRO/1000F (PWLA8490SX)",
+	    "PRO/1000F (82543GC)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC,
-	    "PRO/1000T (PWLA8490T)",
+	    "PRO/1000T (82543GC)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI,
-	    "PRO/1000XT (PWLA8490XT)",
+	    "PRO/1000XT (82544EI)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_SC,
-	    "PRO/1000XF (PWLA8490XF)",
+	    "PRO/1000XF (82544EI)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC,
-	    "PRO/1000T (PWLA8390T)",
+	    "PRO/1000T (82544GC)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM,
-	    "PRO/1000T LOM",
+	    "PRO/1000XT (82544GC)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM,
-	    "PRO/1000MT (PWLA8390MT)",
+	    "PRO/1000MT (82540EM)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM,
-	    "PRO/1000MT (PWLA8490MT)",
+	    "PRO/1000MT (82545EM)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB,
-	    "PRO/1000MT (PWLA8492MT)",
+	    "PRO/1000MT Dual Port (82546EB)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_SC,
-	    "PRO/1000MF (PWLA8490MF)",
+	    "PRO/1000MF (82545EM)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SC,
-	    "PRO/1000MF (PWLA8492MF)",
+	    "PRO/1000MF Dual Port (82546EB)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI,
-	    "PRO/1000 (82541EI)",
+	    "PRO/1000MT (82541EI)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER2,
-	    "PRO/1000 (82541ER)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_NC,
+	    "PRO/1000MT (82541EI)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM,
-	    "PRO/1000MT (LOM)",
+	    "PRO/1000MT Mobile (82540EM)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM,
-	    "PRO/1000 (82540EP LOM)",
+	    "PRO/1000MT (82540EP)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP,
-	    "PRO/1000 (82540EP)",
+	    "PRO/1000MT (82540EP)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EP,
-	    "PRO/1000 (82541EP)",
+	    "PRO/1000MT Mobile (82541EP)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI,
-	    "PRO/1000 (82547EI)",
+	    "PRO/1000CT (82547EI)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_LOM,
-	    "PRO/1000 (82547EI LOM)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOB,
+	    "PRO/1000CT Mobile (82547EI)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD,
-	    "PRO/1000 (82546EB_QUAD)",
+	    "PRO/1000MF Quad Port (82546EB)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP,
-	    "PRO/1000 (82540EP LP)",
+	    "PRO/1000MT Mobile (82540EP)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER,
-	    "PRO/1000 (82545GM)",
+	    "PRO/1000MT (82545GM)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_FIBER,
-	    "PRO/1000 (82545GM)",
+	    "PRO/1000MF (82545GM)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_SERDES,
-	    "PRO/1000 (82545GM)",
+	    "PRO/1000MB (82545GM)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100,
@@ -2931,32 +2931,32 @@ static const struct pci_known_product pci_known_products[] = {
 	    "PRO/100 M",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI,
-	    "PRO/1000MT (82547GI)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_CT,
+	    "PRO/1000CT (82547EI)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI,
-	    "PRO/1000MT (82541GI)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT,
+	    "PRO/1000MT (82541EI)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE,
-	    "PRO/1000MT (82541GI)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOB,
+	    "PRO/1000MT Mobile (82541EI)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER,
-	    "PRO/1000MT (82541ER)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT2,
+	    "PRO/1000MT (82541EI)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER,
-	    "PRO/1000MT (82546GB)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER,
+	    "PRO/1000MT Dual Port (82546EB)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER,
-	    "PRO/1000MT (82546GB)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER,
+	    "PRO/1000MF Dual Port (82546EB)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES,
-	    "PRO/1000MT (82546GB)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SERDES,
+	    "PRO/1000MB Dual Port (82546EB)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_DC100_HUB,