Re: ppc64 build broke between 2.6.11-bk6 and 2.6.11-bk7

[Joel Schopp <jschopp@austin.ibm.com>]

Mikael Pettersson wrote:
> Andrew Morton writes:
>  > "Martin J. Bligh" <mbligh@aracnet.com> wrote:
>  > >
>  > > drivers/built-in.o(.text+0x182bc): In function `.matroxfb_probe':
>  > > : undefined reference to `.mac_vmode_to_var'
>  > > make: *** [.tmp_vmlinux1] Error 1
>  > > 
>  > > Anyone know what that is?
>  > > 
>  > 
>  > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm4/broken-out/fbdev-kconfig-fix-for-macmodes-and-ppc.patch
>  > 
>  > should fix it.
> 
> It seems the culprit is "matroxfb-compile-error.patch" which unconditionally adds
> macmodes.o to the Makefile line for CONFIG_FB_MATROX. This obviously breaks on !ppc.
> The patch Andrew mentions above converts the Kconfig entry for FB_MATROX to do a
> "select FB_MACMODES if PPC_PMAC", so dropping matroxfb-compile-error.patch should suffice.
> 
> 

matroxfb-compile-error.patch was a valid fix for a compile problem. It 
was against 2.6.11-bk10, therefore wasn't in the 2.6.11-bk6 or 2.6.11bk7 
you had problems with and didn't cause this mess to begin with.

It appears the problem was more systemic than what I saw during my 
compile, thus the fbdev-kconfig-fix-for-macmodes-and-ppc.patch probably 
fixes the problem I fixed and a host of others.  Of course it conflicts 
with my patch.

Please drop the matroxfb-compile-error.patch and if the problem isn't 
truly fixed by fbdev-kconfig-fix-for-macmodes-and-ppc.patch I will 
resend it.