[GIT PULL] non-critical omap fixes for v3.12 merge window

[Olof Johansson]

On Wed, Aug 28, 2013 at 10:37:06PM -0700, Tony Lindgren wrote:
> * Olof Johansson <olof at lixom.net> [130828 11:58]:
> > On Thu, Aug 22, 2013 at 10:46:10PM -0700, Tony Lindgren wrote:
> > 
> > > Matus Ujhelyi (1):
> > >       ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards
> > 
> > Sigh. am33xx has been a bit of a pain this release cycle. Can you please
> > start double-checking builds when you apply am33xx stuff? :(
> > 
> > This breaks with:
> > 
> >         multi_v7_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
> > 
> >         omap2plus_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
> 
> Oops sorry, I see what's going on. It builds fine against v3.11-rc6, but
> has a dependency for v3.12 for the cleanup branch that removed all the
> unused defines. 
>  
> > I've unmerged the branch until that's resolved.
> 
> Care to apply the following fix to the cleanup branch?
> 
> This way this fixes branch keeps working both against v3.11 and the
> patches queued for v3.12.

Ah, yeah. Applied. And fixes branch pulled, since we'd otherwise just get most
of them during 3.12-rc. :)


-Olof