summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2009-12-18 21:46:25 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2009-12-18 21:46:25 +0000
commita071d2844b0aca1fbdd02c554f6f4dbff82b2fcc (patch)
tree00b0fdcb5e20db5d28911b5a16b53f2dddcaed41 /sys/dev
parentb722728787d36123da27ad3c948942a9d591bb6b (diff)
More device id ordering, from Brad
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_msk.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index 99e50b31536..da4e9fd84e2 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.84 2009/12/17 01:09:28 sthen Exp $ */
+/* $OpenBSD: if_msk.c,v 1.85 2009/12/18 21:46:24 sthen Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -189,11 +189,6 @@ const struct pci_matchid mskc_devices[] = {
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE550T_B1 },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560SX },
{ PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T },
- { 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_8021CU },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8021X },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8022CU },
@@ -222,8 +217,13 @@ const struct pci_matchid mskc_devices[] = {
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8071 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8072 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8075 },
- { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx },
- { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx }
+ { 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_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx },
+ { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx }
};
static inline u_int32_t