Module Name: src
Committed By: rin
Date: Fri Aug 9 08:04:16 UTC 2019
Modified Files:
src/sys/arch/alpha/pci: pci_machdep.c
Log Message:
Fix build without vga at pci.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/pci/pci_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/pci/pci_machdep.c
diff -u src/sys/arch/alpha/pci/pci_machdep.c:1.23 src/sys/arch/alpha/pci/pci_machdep.c:1.24
--- src/sys/arch/alpha/pci/pci_machdep.c:1.23 Fri Oct 17 18:31:07 2014
+++ src/sys/arch/alpha/pci/pci_machdep.c Fri Aug 9 08:04:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.23 2014/10/17 18:31:07 uebayasi Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.24 2019/08/09 08:04:16 rin Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.23 2014/10/17 18:31:07 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.24 2019/08/09 08:04:16 rin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -66,9 +66,12 @@ pci_display_console(bus_space_tag_t iot,
{
#if NVGA_PCI || NTGA
pcitag_t tag;
- pcireg_t id, class;
+ pcireg_t id;
int match, nmatch;
#endif
+#if NVGA_PCI
+ pcireg_t class;
+#endif
int (*fn)(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
int, int, int);
@@ -78,7 +81,9 @@ pci_display_console(bus_space_tag_t iot,
if (id == 0 || id == 0xffffffff)
panic("pci_display_console: no device at %d/%d/%d",
bus, device, function);
+# if NVGA_PCI
class = pci_conf_read(pc, tag, PCI_CLASS_REG);
+# endif
match = 0;
#endif
