Module Name: src
Committed By: bouyer
Date: Wed Feb 9 15:02:00 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
Fix build when GENFB is not there.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 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.55 src/sys/arch/x86/x86/x86_autoconf.c:1.56
--- src/sys/arch/x86/x86/x86_autoconf.c:1.55 Wed Feb 9 13:24:24 2011
+++ src/sys/arch/x86/x86/x86_autoconf.c Wed Feb 9 15:02:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.55 2011/02/09 13:24:24 jmcneill Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.56 2011/02/09 15:02:00 bouyer 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.55 2011/02/09 13:24:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.56 2011/02/09 15:02:00 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,9 +110,11 @@
static bool
x86_genfb_setmode(struct genfb_softc *sc, int newmode)
{
+#if NGENFB > 0
if (newmode == WSDISPLAYIO_MODE_EMUL)
x86_genfb_mtrr_init(sc->sc_fboffset,
sc->sc_height * sc->sc_stride);
+#endif
return true;
}
