[PATCH] x86-64: ignore vgacon if hardware not present

[linux-2.6-omap-h63xx.git] / drivers / video / console / vgacon.c

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 91a20785108aa26b962fd4412afb51ae427476bb..3e67c34df9a593d6c93f7722037330f9eaff8460 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/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 */