[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 e6916fa97b85a06db9136a29eb7cf4cfcdb31c60..0b0db4edcfa089e18241169b4d111a3f8c9c1112 100644 (file)
--- 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;