diff options
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/files.amd64 | 10 | ||||
| -rw-r--r-- | sys/arch/amd64/pci/pchb.c | 8 |
3 files changed, 18 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index f0689dc1642..31a07e08513 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.180 2007/05/19 19:17:07 tedu Exp $ +# $OpenBSD: GENERIC,v 1.181 2007/05/19 19:32:03 tedu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -221,6 +221,7 @@ 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 diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64 index 451a29610c8..c33e33019bd 100644 --- a/sys/arch/amd64/conf/files.amd64 +++ b/sys/arch/amd64/conf/files.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.amd64,v 1.27 2007/05/06 03:37:08 gwk Exp $ +# $OpenBSD: files.amd64,v 1.28 2007/05/19 19:32:03 tedu Exp $ maxpartitions 16 maxusers 2 16 128 @@ -207,3 +207,11 @@ major {rd = 17} major {wd = 0} major {wt = 3} major {fd = 2} + +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 diff --git a/sys/arch/amd64/pci/pchb.c b/sys/arch/amd64/pci/pchb.c index 4e2b5734c8d..b2fbf898162 100644 --- a/sys/arch/amd64/pci/pchb.c +++ b/sys/arch/amd64/pci/pchb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pchb.c,v 1.5 2007/01/15 23:19:05 jsg Exp $ */ +/* $OpenBSD: pchb.c,v 1.6 2007/05/19 19:32:03 tedu Exp $ */ /* $NetBSD: pchb.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /*- @@ -130,6 +130,12 @@ pchbattach(struct device *parent, struct device *self, void *aux) pchb_amd64ht_attach(self, pa, i); break; } + break; + case PCI_VENDOR_INTEL: +#ifdef PCIAGP + pciagp_set_pchb(pa); +#endif + break; } } |