diff options
| author | Nikolay Sturm <sturm@cvs.openbsd.org> | 2005-03-22 18:33:04 +0000 |
|---|---|---|
| committer | Nikolay Sturm <sturm@cvs.openbsd.org> | 2005-03-22 18:33:04 +0000 |
| commit | 704859ea0bfa6b56bed14db4e01f3cbfb82012f3 (patch) | |
| tree | 9a735af5579226c57b1f85ffa6f834fa8022057b /sys/dev | |
| parent | c4ab190e37c070f991d31f3a20bc17c6ea151d20 (diff) | |
fix merge misses
tested by millert, mbalmer and me; ok grange, mickey
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/agp_i810.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index c9980998dba..95ad465d3e3 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_i810.c,v 1.7 2004/01/20 19:30:40 grange Exp $ */ +/* $OpenBSD: agp_i810.c,v 1.8 2005/03/22 18:33:03 sturm Exp $ */ /* $NetBSD: agp_i810.c,v 1.15 2003/01/31 00:07:39 thorpej Exp $ */ /*- @@ -548,7 +548,7 @@ agp_i810_bind_memory(struct vga_pci_softc *sc, struct agp_memory *mem, if (mem->am_type != 1) return (agp_generic_bind_memory(sc, mem, offset)); - if (isc->chiptype == CHIP_I830) + if (isc->chiptype != CHIP_I810) return (EINVAL); for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE) { @@ -576,7 +576,7 @@ agp_i810_unbind_memory(struct vga_pci_softc *sc, struct agp_memory *mem) if (mem->am_type != 1) return (agp_generic_unbind_memory(sc, mem)); - if (isc->chiptype == CHIP_I830) + if (isc->chiptype != CHIP_I810) return (EINVAL); for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE) |