summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2006-01-01 18:40:08 +0000
committerkettenis <kettenis@openbsd.org>2006-01-01 18:40:08 +0000
commit275f08b36cf60893993b0de8ab7b7dfe8c004559 (patch)
tree24c44c741052266f0d64b187f78a33984a8e1796
parentregen (diff)
downloadwireguard-openbsd-275f08b36cf60893993b0de8ab7b7dfe8c004559.tar.xz
wireguard-openbsd-275f08b36cf60893993b0de8ab7b7dfe8c004559.zip
Adjust for renamed VIA VT8233 PCI ID's.
ok brad@, deraadt@
-rw-r--r--sys/arch/i386/pci/pci_intr_fixup.c6
-rw-r--r--sys/dev/pci/pciide.c6
-rw-r--r--sys/dev/pci/viapm.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c
index 4f7262e8553..eb51ce73ee9 100644
--- a/sys/arch/i386/pci/pci_intr_fixup.c
+++ b/sys/arch/i386/pci/pci_intr_fixup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_intr_fixup.c,v 1.50 2005/11/24 03:54:45 brad Exp $ */
+/* $OpenBSD: pci_intr_fixup.c,v 1.51 2006/01/01 18:40:08 kettenis Exp $ */
/* $NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $ */
/*
@@ -192,12 +192,12 @@ const struct pciintr_icu_table {
via82c586_init, },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_ISA,
via82c586_init },
- { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8366_ISA,
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8233_ISA,
via82c586_init },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8231_ISA,
via8231_init },
- { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8233_ISA,
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8233A_ISA,
via8231_init },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8235_ISA,
via8231_init },
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 1281baec008..dcf5c7947ec 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.218 2005/12/15 00:01:10 krw Exp $ */
+/* $OpenBSD: pciide.c,v 1.219 2006/01/01 18:40:08 kettenis Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -2716,11 +2716,11 @@ apollo_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
}
break;
case PCI_PRODUCT_VIATECH_VT8231_ISA:
- case PCI_PRODUCT_VIATECH_VT8366_ISA:
+ case PCI_PRODUCT_VIATECH_VT8233_ISA:
printf(": ATA100");
sc->sc_wdcdev.UDMA_cap = 5;
break;
- case PCI_PRODUCT_VIATECH_VT8233_ISA:
+ case PCI_PRODUCT_VIATECH_VT8233A_ISA:
case PCI_PRODUCT_VIATECH_VT8235_ISA:
case PCI_PRODUCT_VIATECH_VT8237_ISA:
printf(": ATA133");
diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c
index 3b654e3d16d..13dd90ee1f9 100644
--- a/sys/dev/pci/viapm.c
+++ b/sys/dev/pci/viapm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viapm.c,v 1.2 2005/12/30 01:15:15 jsg Exp $ */
+/* $OpenBSD: viapm.c,v 1.3 2006/01/01 18:40:08 kettenis Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis <kettenis@openbsd.org>
@@ -125,10 +125,10 @@ struct cfdriver viapm_cd = {
};
const struct pci_matchid viapm_ids[] = {
- { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8366_ISA },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8233_ISA },
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8233A_ISA },
{ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8235_ISA },
- { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237_ISA },
+ { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237_ISA }
};
int