summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf/GENERIC
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2007-11-25 17:11:13 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2007-11-25 17:11:13 +0000
commitf6e609402178409f4ffab378b534c5668d547e35 (patch)
tree01a30adae412455b8dc5fff7ffeb751f12ffbb93 /sys/arch/amd64/conf/GENERIC
parent36d2c964c15e49779643651e2e0f68f3a2b9f26c (diff)
Make agp attach as a device. This means that many more agp bridges
actually get detected and attached. Also adds a kernel api for manipulating agp. Enable this on i386 and amd64. "I think you should commit it" deraadt@, ok matthieu. Looked over by several others.
Diffstat (limited to 'sys/arch/amd64/conf/GENERIC')
-rw-r--r--sys/arch/amd64/conf/GENERIC5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e0d1bb9ca78..ae3264f79a0 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.205 2007/11/25 12:00:46 jsg Exp $
+# $OpenBSD: GENERIC,v 1.206 2007/11/25 17:11:12 oga Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -64,6 +64,8 @@ pci* at pchb?
pcib* at pci? # PCI-ISA bridge
amdpcib* at pci? # AMD 8111 LPC bridge
+agp* at pchb? # AGP bridge
+
# National Semiconductor LM7[89] and compatible hardware monitors
lm0 at isa? port 0x290
#lm1 at isa? port 0x280
@@ -237,7 +239,6 @@ pms* at pckbc? # PS/2 mouse for wsmouse
pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
vga0 at isa?
vga* at pci?
-option PCIAGP
wsdisplay* at vga?
wskbd* at pckbd? mux 1
wsmouse* at pms? mux 0