From b6b981bccb5f944e93a5c11a04f6dcf210cb74fc Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 2 May 2007 19:27:19 +0200 Subject: [PATCH] --- yaml --- r: 53919 b: refs/heads/master c: f82af20e1a028e16b9bb11da081fa1148d40fa6a h: refs/heads/master i: 53917: 4e18051825cc1fe5dddab56c2215ceb41bf0302e 53915: 1d57456e1ee72680231668c3c21739a454b9f311 53911: d9cb52c756161a1b154573370adfc83f97bdfedb 53903: 1ec9c5083ce1ddcd8cb7cd790e3edd9a9b898eb7 53887: 44251c6c050e939336083985d7c26ca94c8a72f6 v: v3 --- [refs] | 2 +- trunk/drivers/video/console/vgacon.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 51bf3ea0fe06..19e4ec1d31be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 889f21ce272e38db19c8114a7e0a5793d4590077 +refs/heads/master: f82af20e1a028e16b9bb11da081fa1148d40fa6a diff --git a/trunk/drivers/video/console/vgacon.c b/trunk/drivers/video/console/vgacon.c index 91a20785108a..3e67c34df9a5 100644 --- a/trunk/drivers/video/console/vgacon.c +++ b/trunk/drivers/video/console/vgacon.c @@ -371,7 +371,8 @@ static const char *vgacon_startup(void) } /* VGA16 modes are not handled by VGACON */ - if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ + if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */ + (ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */ (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */ (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */