Module Name: src
Committed By: macallan
Date: Thu Apr 11 18:04:20 UTC 2013
Modified Files:
src/sys/arch/powerpc/oea: ofw_rascons.c
Log Message:
for some reason we can't use the ROM font on G5, so disable it with
options OFWOEA_WSCONS_NO_ROM_FONT
from Phileas Fogg
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/oea/ofw_rascons.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/powerpc/oea/ofw_rascons.c
diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.8 src/sys/arch/powerpc/oea/ofw_rascons.c:1.9
--- src/sys/arch/powerpc/oea/ofw_rascons.c:1.8 Wed Feb 1 09:54:03 2012
+++ src/sys/arch/powerpc/oea/ofw_rascons.c Thu Apr 11 18:04:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_rascons.c,v 1.8 2012/02/01 09:54:03 matt Exp $ */
+/* $NetBSD: ofw_rascons.c,v 1.9 2013/04/11 18:04:20 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.8 2012/02/01 09:54:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.9 2013/04/11 18:04:20 macallan Exp $");
#include "wsdisplay.h"
@@ -98,7 +98,9 @@ rascons_cnattach(void)
wsfont_init();
if (copy_rom_font() == 0) {
+#if !defined(OFWOEA_WSCONS_NO_ROM_FONT)
romfont_loaded = 1;
+#endif /* !OFWOEA_WSCONS_NO_ROM_FONT */
}
/* set up rasops */
