diff options
Diffstat (limited to 'sys/arch/i386/conf')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 295fd8571ec..12d6c098087 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.590 2007/11/25 12:00:46 jsg Exp $ +# $OpenBSD: GENERIC,v 1.591 2007/11/25 17:11:12 oga Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -90,6 +90,7 @@ gpio* at gscpcib? glxpcib* at pci? # AMD CS5536 PCI-ISA bridge gpio* at glxpcib? +agp* at pchb? # AGP bridges # power management and other environmental stuff elansc* at pci? # AMD Elan SC520 System Controller gpio* at elansc? @@ -300,7 +301,6 @@ pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse vga0 at isa? -option PCIAGP vga* at pci? pcdisplay0 at isa? # CGA, MDA, EGA, HGA wsdisplay* at vga? diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index cff1f90b9de..0466e09ec8e 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.168 2007/11/25 15:42:15 tedu Exp $ +# $OpenBSD: files.i386,v 1.169 2007/11/25 17:11:12 oga Exp $ # # new style config file for i386 architecture # @@ -96,19 +96,15 @@ file arch/i386/i386/mainbus.c mainbus # include "../../../dev/pci/files.pci" +include "../../../dev/pci/files.agp" file arch/i386/pci/pci_machdep.c pci -file arch/i386/pci/agp_machdep.c pciagp -file dev/pci/agp_ali.c pciagp -file dev/pci/agp_amd.c pciagp -file dev/pci/agp_i810.c pciagp -file dev/pci/agp_intel.c pciagp -file dev/pci/agp_sis.c pciagp -file dev/pci/agp_via.c pciagp +file arch/i386/pci/agp_machdep.c agp 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 +device pchb: pcibus, agpbus, agp_ali, agp_amd, agp_i810, agp_intel, agp_sis, + agp_via attach pchb at pci file arch/i386/pci/pchb.c pchb |