diff options
| author | Gerd Hoffmann <kraxel@suse.de> | 2007-05-02 13:27:19 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 13:27:19 -0400 |
| commit | f82af20e1a028e16b9bb11da081fa1148d40fa6a (patch) | |
| tree | 90bff2de9c6f005ef0733031612cff38fc3576ca /drivers/video/console | |
| parent | 889f21ce272e38db19c8114a7e0a5793d4590077 (diff) | |
[PATCH] x86-64: ignore vgacon if hardware not present
Avoid trying to set up vgacon if there's no vga hardware present.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Alan <alan@lxorguk.ukuu.org.uk>
Acked-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/video/console')
| -rw-r--r-- | drivers/video/console/vgacon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 91a20785108a..3e67c34df9a5 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
| @@ -371,7 +371,8 @@ static const char *vgacon_startup(void) | |||
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | /* VGA16 modes are not handled by VGACON */ | 373 | /* VGA16 modes are not handled by VGACON */ |
| 374 | if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ | 374 | if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */ |
| 375 | (ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */ | ||
| 375 | (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */ | 376 | (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */ |
| 376 | (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */ | 377 | (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */ |
| 377 | (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */ | 378 | (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */ |