summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-06-01 02:07:13 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-06-01 02:07:13 +0000
commit83a940d9f43619f58abcf89ad0c059621c22b02e (patch)
treef1b9b53333dd1b82bd22d3c1bad60b7cebfe5ad2 /sys/dev
parentd11ad8b358dfec528602b991f8f236f8bb63b6a6 (diff)
fix ordering of PCI devs
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_em.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index b987afd3449..4c10ab4867c 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
-/* $OpenBSD: if_em.c,v 1.53 2005/05/29 07:54:26 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.54 2005/06/01 02:07:12 brad Exp $ */
#include "bpfilter.h"
#include "vlan.h"
@@ -105,15 +105,15 @@ const struct pci_matchid em_devices[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOBILE },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER_LOM },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOBILE },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_LF },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542 },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_COPPER },
@@ -128,9 +128,9 @@ const struct pci_matchid em_devices[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_PCIE },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOBILE },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI },