Module Name: src
Committed By: tron
Date: Wed Nov 25 19:46:19 UTC 2009
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
Fix build of kernels without PCI support like "GENERIC_TINY".
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x86/x86/x86_autoconf.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/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.46 src/sys/arch/x86/x86/x86_autoconf.c:1.47
--- src/sys/arch/x86/x86/x86_autoconf.c:1.46 Fri Nov 6 23:10:22 2009
+++ src/sys/arch/x86/x86/x86_autoconf.c Wed Nov 25 19:46:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.46 2009/11/06 23:10:22 dyoung Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.46 2009/11/06 23:10:22 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,11 +67,15 @@
#include <dev/pci/pcivar.h>
#endif
#include <dev/wsfb/genfbvar.h>
+#if NPCI > 0
#include <dev/pci/genfb_pcivar.h>
+#endif
#include <dev/ic/vgareg.h>
+#if NPCI > 0
static struct genfb_colormap_callback gfb_cb;
static struct genfb_pmf_callback pmf_cb;
+#endif
#ifdef VGA_POST
static struct vga_post *vga_posth = NULL;
#endif
