[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20100614154151.GA20343@oksana.dev.rtsoft.ru>
Date: Mon, 14 Jun 2010 19:41:51 +0400
From: Anton Vorontsov <cbouatmailru@...il.com>
To: Peter Huewe <PeterHuewe@....de>
Cc: Mike Rapoport <mike@...pulab.co.il>,
Wolfram Sang <w.sang@...gutronix.de>,
Tejun Heo <tj@...nel.org>, Ryan Mallon <ryan@...ewatersys.com>,
linux-kernel@...r.kernel.org, linux-sh@...r.kernel.org,
sfr@...b.auug.org.au,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: Re: [PATCH] power: Rename get_current to fix build failure / name
conflict
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 <peterhuewe@....de>
> > >
> > > 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 <peterhuewe@....de>
> > Acked-by: Ryan Mallon <ryan@...ewatersys.com>
> > Acked-by: Mike Rapoport <mike@...pulab.co.il>
>
> 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: cbouatmailru@...il.com
irc://irc.freenode.net/bd2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists