[Linux-fbdev-devel] Re: Linux 2.4.20-pre6

[Geert U. <ge...@li...>]

On Wed, 11 Sep 2002, Geert Uytterhoeven wrote:
> On Wed, 11 Sep 2002, Adrian Bunk wrote:
> > On Tue, 10 Sep 2002, Marcelo Tosatti wrote:
> > 
> > >...
> > > Geert Uytterhoeven <ge...@li...>:
> > >...
> > >   o Wrong fbcon_mac dependency
> > >...
> > 
> > It's possible to enable CONFIG_FBCON_MAC on !m68k and after your change
> > the compilation breaks on i386 with the following error:
> > 
> > <--  snip  -->
> > 
> > ...
> > gcc -D__KERNEL__ -I/home/bunk/linux/kernel-2.4/linux-2.4.19-full/include
> > -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
> > -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6   -nostdinc
> > -iwithprefix include -DKBUILD_BASENAME=fbcon  -c -o fbcon.o fbcon.c
> > fbcon.c: In function `fbcon_setup':
> > fbcon.c:641: `MACH_IS_MAC' undeclared (first use in this function)
> > fbcon.c:641: (Each undeclared identifier is reported only once
> > fbcon.c:641: for each function it appears in.)
> > make[3]: *** [fbcon.o] Error 1
> > make[3]: Leaving directory `/home/bunk/linux/kernel-2.4/linux-2.4.19-full/drivers/video'
> 
> Hmmm... I didn't realize vesafb can use fbcon-mac.
> 
> However, it seems to be used if you don't enable any of the fbcon-cfb* modules
> only, since fbcon-cfb* takes precendence.
> 
> Do people really use 6x11 fonts with vesafb?

Unless someone comes up with a better solution, I suggest to apply following
patch:

--- linux-2.4.20-pre6/drivers/video/fbcon.c	Wed Sep 11 08:19:48 2002
+++ linux-m68k-2.4.20-pre6/drivers/video/fbcon.c	Thu Sep 12 15:22:35 2002
@@ -637,7 +637,7 @@
     }
     
     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;

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds