diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-15 14:14:36 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-15 14:14:36 +0000 |
| commit | dac3cdb1cf6cc073e38555ab8a96fc800e25b1d1 (patch) | |
| tree | 10c56cd9edf173c6372f86a9b92a596f355fcb5f /sys/arch/amiga | |
| parent | becdf267688df3769574522619532b8d1eec0eef (diff) | |
Stupid merge error. Thanks to Michael Shuldman <michaels@eunet.no>.
Diffstat (limited to 'sys/arch/amiga')
| -rw-r--r-- | sys/arch/amiga/dev/grf_cv.c | 4 |
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 }; |