From 5ec0aaf6a0b9beeee5bbcc5eb6598a5a970fa73e Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Tue, 8 May 2007 00:37:29 -0700
Subject: [PATCH] --- yaml --- r: 54876 b: refs/heads/master c:
 464bdd33e9baad9806c7adbd8dfc37081a55f27e h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/boot/video.S | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 91f8f4a5f290..7eb4c3680d01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66fd14120edea89d353fac0649e9ec0045ec958f
+refs/heads/master: 464bdd33e9baad9806c7adbd8dfc37081a55f27e
diff --git a/trunk/arch/i386/boot/video.S b/trunk/arch/i386/boot/video.S
index 8143c9516cb4..5e2280cf4456 100644
--- a/trunk/arch/i386/boot/video.S
+++ b/trunk/arch/i386/boot/video.S
@@ -496,9 +496,11 @@ mode_set:
 	cmpb	$VIDEO_FIRST_V7>>8, %ah
 	jz	setv7
 	
+#ifdef CONFIG_FB
 	cmpb	$VIDEO_FIRST_VESA>>8, %ah
 	jnc	check_vesa
-	
+#endif
+
 	orb	%ah, %ah
 	jz	setmenu