* Alistair Buxton <a.j.buxton@gmail.com> [090929 16:52]:
> 2009/9/29 Tony Lindgren <tony@atomide.com>:
> > * Premi, Sanjeev <premi@ti.com> [090929 04:34]:
> >> Hi Tony,
> >>
> >> Can you push this patch to 2.6.32-rc1?
> >>
> >> 7a8d53a0:  arch: arm: omap: terminate ifndef
> >>
> >> I was unable to refresh my patches against this baseline.
> >> OR, is it okay if I re-submit against the 'master'.
> >
> > Sorry, I was meaning to look where the mismatch really came
> > from but forgot.
> >
> > Looks like adding omap850 support added an #else without removing
> > the #endif above it, and also removed another #endif in commit
> > ae302f40061235f6bc58ae9ba02aa849d60223b5.
> 
> The #else immediately after the removed #endif needs to go as well,
> because the block that the #endif(s) belongs to already has an #else.
> 
> That means the bug not only caused everything after the extra #endif
> to have no multiple inclusion protection (causing the redefinitions),
> but the extra #else also caused cpu_is_omap850() to be true only when
> cpu.h was included twice.

Ah, right! So we're back to http://patchwork.kernel.org/patch/42292/
and we also need to add back the missing #endif to the end of file
file.

Here's an updated version of 42292, hopefully this will do the trick.

Regards,

Tony