From a071d2844b0aca1fbdd02c554f6f4dbff82b2fcc Mon Sep 17 00:00:00 2001 From: Stuart Henderson Date: Fri, 18 Dec 2009 21:46:25 +0000 Subject: More device id ordering, from Brad --- sys/dev/pci/if_msk.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/dev') 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 -- cgit v1.2.3