summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorJordan Hargrave <jordan@cvs.openbsd.org>2010-07-01 06:29:33 +0000
committerJordan Hargrave <jordan@cvs.openbsd.org>2010-07-01 06:29:33 +0000
commit89d383c71ad84f4d1ad9b9f747df8fd8d59d166d (patch)
tree1344a9dda8fee63f8506921e888b909349f88ffb /sys/arch
parentb0aaff34b3bc1295a0eab7c8c181dea565af2d3c (diff)
Backout recent AML changes, breaks on R210 and others
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/pci/pci_machdep.c4
-rw-r--r--sys/arch/i386/pci/pci_machdep.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index d2f35bed37e..5c36eb3d91e 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.33 2010/06/29 22:08:29 jordan Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.34 2010/07/01 06:29:32 jordan Exp $ */
/* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */
/*-
@@ -428,6 +428,6 @@ void
pci_dev_postattach(struct device *dev, struct pci_attach_args *pa)
{
#if NACPI > 0
- acpi_pci_match(dev, pa);
+ //acpi_pci_match(dev, pa);
#endif
}
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index fa15c2019d4..f75a68e06c7 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.51 2010/06/29 22:08:28 jordan Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.52 2010/07/01 06:29:32 jordan Exp $ */
/* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */
/*-
@@ -667,6 +667,6 @@ void
pci_dev_postattach(struct device *dev, struct pci_attach_args *pa)
{
#if NACPI > 0
- acpi_pci_match(dev, pa);
+ //acpi_pci_match(dev, pa);
#endif
}