Am Donnerstag 13 Mai 2010 07:27:28 schrieb Mike Rapoport:
> Peter Huewe wrote:
> > From: Peter Huewe <[email protected]>
> >
> > This patch changes the name of get_current function pointer to
> > get_battery_current to resolve a name conflict with the get_current
> > macro defined in current.h.
> >
> > This conflict resulted in a build-failure[1] for the sh4 arch
> > allyesconfig which is resolved by this patch.
> >
> > To be consistent the other function pointers (_voltage,_capacity) were
> > renamed too.
> >
> > Signed-off-by: Peter Huewe <[email protected]>
> Acked-by: Ryan Mallon <[email protected]>
> Acked-by: Mike Rapoport <[email protected]>
Unfortunately this build-failure still exists, in Linux-next and hit Linus'
Tree :/
References:
http://kisskb.ellerman.id.au/kisskb/buildresult/2709436/
http://kisskb.ellerman.id.au/kisskb/buildresult/2687686/
Thanks,
Peter
On Mon, Jun 14, 2010 at 05:12:22PM +0200, Peter Huewe wrote:
> Am Donnerstag 13 Mai 2010 07:27:28 schrieb Mike Rapoport:
> > Peter Huewe wrote:
> > > From: Peter Huewe <[email protected]>
> > >
> > > This patch changes the name of get_current function pointer to
> > > get_battery_current to resolve a name conflict with the get_current
> > > macro defined in current.h.
> > >
> > > This conflict resulted in a build-failure[1] for the sh4 arch
> > > allyesconfig which is resolved by this patch.
> > >
> > > To be consistent the other function pointers (_voltage,_capacity) were
> > > renamed too.
> > >
> > > Signed-off-by: Peter Huewe <[email protected]>
> > Acked-by: Ryan Mallon <[email protected]>
> > Acked-by: Mike Rapoport <[email protected]>
>
> Unfortunately this build-failure still exists, in Linux-next and hit Linus'
> Tree :/
>
> References:
> http://kisskb.ellerman.id.au/kisskb/buildresult/2709436/
> http://kisskb.ellerman.id.au/kisskb/buildresult/2687686/
Thanks for the patch.
As this is not a 2.6.35 regression, and only affects just
a few embedded platforms, I think this can wait for the next
merge window.
So, applied to battery-2.6.git (for -next).
--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2