From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 3 Nov 2002 07:52:01 +0000 (-0800)
Subject: [PATCH] vesafb 6x11 font fix
X-Git-Tag: v2.5.46~14^2~44
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=bc3d1389cf7541053a94d83a15320b7db03ae953;p=history.git

[PATCH] vesafb 6x11 font fix

Compile fix if fbcon-mac is used with vesafb (from 2.4.20-pre7)
---

diff --git a/drivers/video/fbcon.c b/drivers/video/fbcon.c
index e6916fa97b85..0b0db4edcfa0 100644
--- a/drivers/video/fbcon.c
+++ b/drivers/video/fbcon.c
@@ -627,7 +627,7 @@ static void fbcon_setup(int con, int init, int logo)
     }
     
     if (!fontwidthvalid(p,fontwidth(p))) {
-#ifdef CONFIG_FBCON_MAC
+#if defined(CONFIG_FBCON_MAC) && defined(CONFIG_MAC)
 	if (MACH_IS_MAC)
 	    /* ++Geert: hack to make 6x11 fonts work on mac */
 	    p->dispsw = &fbcon_mac;