diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-07-04 18:26:31 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-07-04 18:26:31 +0000 |
| commit | 547c787f636c131945593bc4fd8ef9735ebc865b (patch) | |
| tree | 859d31adaa0055457a0213aaf5287144a42f2e05 /sys/dev/pci | |
| parent | c00e4b54e090b8a58e9c713ffb6cfeedfde5ddf9 (diff) | |
Back out the workaround committed in rev 1.13 now that we no longer blindly
enable io and mem space on all matched PCI devices.
ok deraadt@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/ppb.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index 6632931e56a..bd21727ff23 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppb.c,v 1.15 2006/03/19 21:57:55 brad Exp $ */ +/* $OpenBSD: ppb.c,v 1.16 2006/07/04 18:26:30 kettenis Exp $ */ /* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -66,13 +66,10 @@ ppbmatch(struct device *parent, void *match, void *aux) struct pci_attach_args *pa = aux; /* - * These devices are mislabeled. They are not PCI bridges. + * This device is mislabeled. It is not a PCI bridge. */ - if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_VIATECH && - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VT82C586_PWR) || - (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_ATI && - (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_RS480_PCIE_2 || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ATI_RS480_PCIE_3))) + if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_VIATECH && + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_VIATECH_VT82C586_PWR) return (0); /* * Check the ID register to see that it's a PCI bridge. |