[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20070430155007.E4996151F8@wotan.suse.de>
Date: Mon, 30 Apr 2007 17:50:07 +0200 (CEST)
From: Andi Kleen <ak@...e.de>
To: kraxel@...e.de, alan@...rguk.ukuu.org.uk, patches@...-64.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] [34/34] x86_64: ignore vgacon if hardware not present
From: Gerd Hoffmann <kraxel@...e.de>
Avoid trying to set up vgacon if there's no vga hardware present.
Signed-off-by: Jeremy Fitzhardinge <jeremy@...source.com>
Signed-off-by: Rusty Russell <rusty@...tcorp.com.au>
Signed-off-by: Andi Kleen <ak@...e.de>
Cc: Alan <alan@...rguk.ukuu.org.uk>
Acked-by: Ingo Molnar <mingo@...e.hu>
---
drivers/video/console/vgacon.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
===================================================================
Index: linux/drivers/video/console/vgacon.c
===================================================================
--- linux.orig/drivers/video/console/vgacon.c
+++ linux/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 */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists