summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniklas <niklas@openbsd.org>1998-01-15 14:14:35 +0000
committerniklas <niklas@openbsd.org>1998-01-15 14:14:35 +0000
commit62b56c7abec106dac300b95afeae2c9ef462ca83 (patch)
treed1bc3a2db3dc2f89c7e9d6b71cd7915343ee5c5e
parentRe-enabled write protection on read-only file system mounts. Thanks to (diff)
downloadwireguard-openbsd-62b56c7abec106dac300b95afeae2c9ef462ca83.tar.xz
wireguard-openbsd-62b56c7abec106dac300b95afeae2c9ef462ca83.zip
Stupid merge error. Thanks to Michael Shuldman <michaels@eunet.no>.
-rw-r--r--sys/arch/amiga/dev/grf_cv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amiga/dev/grf_cv.c b/sys/arch/amiga/dev/grf_cv.c
index 034cd957ae7..1d33e2a975a 100644
--- a/sys/arch/amiga/dev/grf_cv.c
+++ b/sys/arch/amiga/dev/grf_cv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_cv.c,v 1.15 1997/09/18 13:39:49 niklas Exp $ */
+/* $OpenBSD: grf_cv.c,v 1.16 1998/01/15 14:14:35 niklas Exp $ */
/* $NetBSD: grf_cv.c,v 1.24 1997/07/30 11:05:55 veego Exp $ */
/*
@@ -146,7 +146,7 @@ extern unsigned char S3FONT[];
*/
struct grfcvtext_mode cvconsole_mode = {
{ 255, "", 25000000, 640, 480, 4, 640/8, 680/8, 768/8, 800/8,
- 481, 521, 491, 493, 525 },
+ 481, 491, 493, 525, 0 },
8, S3FONTY, 80, 480 / S3FONTY, S3FONT, 32, 255
};