diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-08-17 21:31:38 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-08-17 21:31:38 +0000 |
| commit | ee005c81e063f8765058163a40cb3085bd7087e9 (patch) | |
| tree | 93d08f640d6b0876e35ccc32b4890715f65c89af /sys/dev/pci | |
| parent | 5808ba7ed98d072f65ac4c6b60c9ff03acc0d242 (diff) | |
remove PCI ids which msk(4) will match against from sk(4).
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_sk.c | 20 |
2 files changed, 3 insertions, 21 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index cb6124ebbf7..eeeb8bedee9 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.7 2006/08/17 21:07:20 brad Exp $ */ +/* $OpenBSD: if_msk.c,v 1.8 2006/08/17 21:31:37 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -788,7 +788,7 @@ int mskc_probe(struct device *parent, void *match, void *aux) { return (pci_matchbyid((struct pci_attach_args *)aux, mskc_devices, - sizeof(mskc_devices)/sizeof(mskc_devices[0])) ? 3 : 0); + sizeof(mskc_devices)/sizeof(mskc_devices[0]))); } /* diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 2451140532a..d29afe8ede9 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.123 2006/08/09 05:03:28 brad Exp $ */ +/* $OpenBSD: if_sk.c,v 1.124 2006/08/17 21:31:37 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -217,29 +217,11 @@ const struct pci_matchid skc_devices[] = { { PCI_VENDOR_CNET, PCI_PRODUCT_CNET_GIGACARD }, { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T_A1 }, { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T_B1 }, - { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T }, { PCI_VENDOR_LINKSYS, PCI_PRODUCT_LINKSYS_EG1064 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_BELKIN }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_3 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8038 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8052 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8050 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8053 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021CU }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022CU }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021X }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022X }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061CU }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062CU }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061X }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062X }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK98XX }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK98XX2 }, - { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx }, - { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx } }; #define SK_LINKSYS_EG1032_SUBID 0x00151737 |