summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-12-07 13:07:18 +0000
committermiod <miod@openbsd.org>2014-12-07 13:07:18 +0000
commit3b3b37fe22b0186ddd047688ca26b528a22fdad6 (patch)
tree54bb626588659f5b1823234f4817f9df58488028
parentRemove get_optional_pkey_id() - it is a hack that existed due to GOST (diff)
downloadwireguard-openbsd-3b3b37fe22b0186ddd047688ca26b528a22fdad6.tar.xz
wireguard-openbsd-3b3b37fe22b0186ddd047688ca26b528a22fdad6.zip
Bring the 12x22 font in even if SMALL_KERNEL on sgi.
-rw-r--r--sys/dev/wsfont/wsfont.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 78b38dabf51..958f4418a2c 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfont.c,v 1.36 2014/07/12 18:48:53 tedu Exp $ */
+/* $OpenBSD: wsfont.c,v 1.37 2014/12/07 13:07:18 miod Exp $ */
/* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */
/*-
@@ -95,7 +95,8 @@
/*
* Make sure we always have at least one font.
- * Sparc, sparc64 always provide a 8x16 font and a larger 12x22 font.
+ * Some platforms (currently luna88k, sgi, sparc and sparc64) always provide
+ * a 8x16 font and a larger 12x22 font.
* Other platforms also provide both, but the 12x22 font is omitted if
* option SMALL_KERNEL.
*/
@@ -103,7 +104,8 @@
#define HAVE_FONT 1
#define FONT_BOLD8x16_ISO1
-#if defined(__sparc__) || defined(__sparc64__) || defined(__luna88k__) || !defined(SMALL_KERNEL)
+#if defined(__luna88k__) || defined(__sgi__) || defined(__sparc__) || \
+ defined(__sparc64__) || !defined(SMALL_KERNEL)
#define FONT_GALLANT12x22
#endif