diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-01-24 19:58:34 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-01-24 19:58:34 +0000 |
| commit | 0ef244d8476654749f2eaf9441dc06b2fd4d4f7b (patch) | |
| tree | 270851bce850e6dddd96484e78fa648cb8bec296 /sys/arch/alpha/pci/pci_machdep.c | |
| parent | a77b8c21d70779c5365903c1f86d3c3126549212 (diff) | |
Sync with NetBSD 961207
Diffstat (limited to 'sys/arch/alpha/pci/pci_machdep.c')
| -rw-r--r-- | sys/arch/alpha/pci/pci_machdep.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c index 128fcc2676e..f24271a68c3 100644 --- a/sys/arch/alpha/pci/pci_machdep.c +++ b/sys/arch/alpha/pci/pci_machdep.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pci_machdep.c,v 1.6 1996/12/08 00:20:42 niklas Exp $ */ -/* $NetBSD: pci_machdep.c,v 1.6 1996/10/23 04:12:29 cgd Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.7 1997/01/24 19:57:52 niklas Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.7 1996/11/19 04:57:32 cgd Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -45,9 +45,9 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include "pcivga.h" -#if NPCIVGA -#include <alpha/pci/pcivgavar.h> +#include "vga_pci.h" +#if NVGA_PCI +#include <alpha/pci/vga_pcivar.h> #endif #include "tga.h" @@ -77,11 +77,11 @@ pci_display_console(iot, memt, pc, bus, device, function) match = 0; fn = NULL; -#if NPCIVGA - nmatch = DEVICE_IS_PCIVGA(class, id); +#if NVGA_PCI + nmatch = DEVICE_IS_VGA_PCI(class, id); if (nmatch > match) { match = nmatch; - fn = pcivga_console; + fn = vga_pci_console; } #endif #if NTGA |