summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-03-04 21:14:30 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-03-04 21:14:30 +0000
commit5564c2a495d3b39cf88f9e94fb14ca555fbb4fec (patch)
treeef475518477ded3c8bf34c9274d9a3df1a64a3ab /sys/arch
parent800049910c1f0a880ad4eb19a649850bf3a0c94e (diff)
sthen@ has an motherboard with both agp and pcie that fails to boot.
disabling agp_ali solves this. Proper fix shall hopefully some sometime after release. Shouldn't affect anyone. ok sthen@, prodded by deraadt@.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/files.i3864
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 5fc444309bd..d7ef2e18a9e 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.171 2007/11/28 17:05:09 tedu Exp $
+# $OpenBSD: files.i386,v 1.172 2008/03/04 21:14:29 oga Exp $
#
# new style config file for i386 architecture
#
@@ -103,7 +103,7 @@ file arch/i386/pci/pciide_machdep.c pciide
file arch/i386/pci/pcic_pci_machdep.c pcic_pci
# PCI-Host bridge chipsets
-device pchb: pcibus, agpbus, agp_ali, agp_amd, agp_i810, agp_intel, agp_sis,
+device pchb: pcibus, agpbus, agp_amd, agp_i810, agp_intel, agp_sis,
agp_via
attach pchb at pci
file arch/i386/pci/pchb.c pchb