From e0e72bc78b187b57a6f7e98347ba15b306a3508f Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@cvs.openbsd.org>
Date: Sun, 1 Jan 2006 19:06:45 +0000
Subject: update for pcidevs name change

---
 sys/dev/cardbus/if_fxp_cardbus.c | 6 +++---
 sys/dev/pci/if_fxp_pci.c         | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index aa508bbf0a2..d31d5fe29cc 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_cardbus.c,v 1.11 2005/05/16 01:36:25 brad Exp $ */
+/*	$OpenBSD: if_fxp_cardbus.c,v 1.12 2006/01/01 19:06:43 brad Exp $ */
 /*	$NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
  */
 
 /*
- * CardBus front-end for the Intel i82557 family of Ethernet chips.
+ * CardBus front-end for the Intel i8255x family of Ethernet chips.
  */
 
 #include "bpfilter.h"
@@ -105,7 +105,7 @@ struct cfattach fxp_cardbus_ca = {
 };
 
 const struct cardbus_matchid fxp_cardbus_devices[] = {
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82557 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8255x },
 };
 
 #ifdef CBB_DEBUG
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index 38264d17fea..875f56fcd5e 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_pci.c,v 1.42 2005/12/18 00:02:32 brad Exp $	*/
+/*	$OpenBSD: if_fxp_pci.c,v 1.43 2006/01/01 19:06:44 brad Exp $	*/
 
 /*
  * Copyright (c) 1995, David Greenman
@@ -85,7 +85,7 @@ struct cfattach fxp_pci_ca = {
 };
 
 const struct pci_matchid fxp_pci_devices[] = {
-	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82557 },
+	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_8255x },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82559 },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82559ER },
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82562 },
@@ -123,9 +123,6 @@ const struct pci_matchid fxp_pci_devices[] = {
 	{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801GB_LAN_2 },
 };
 
-/*
- * Check if a device is an 82557.
- */
 int
 fxp_pci_match(parent, match, aux)
 	struct device *parent;
@@ -180,7 +177,7 @@ fxp_pci_attach(parent, self, aux)
 	}
 
 	switch (PCI_PRODUCT(pa->pa_id)) {
-	case PCI_PRODUCT_INTEL_82557:
+	case PCI_PRODUCT_INTEL_8255x:
 	case PCI_PRODUCT_INTEL_82559:
 	case PCI_PRODUCT_INTEL_82559ER:
 	{
-- 
cgit v1.2.3