From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anton Vorontsov Date: Mon, 14 Jun 2010 15:41:51 +0000 Subject: Re: [PATCH] power: Rename get_current to fix build failure / name Message-Id: <20100614154151.GA20343@oksana.dev.rtsoft.ru> List-Id: References: <201005130154.58459.PeterHuewe@gmx.de> <4BEB8DC0.4060808@compulab.co.il> <201006141712.22248.PeterHuewe@gmx.de> In-Reply-To: <201006141712.22248.PeterHuewe@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Peter Huewe Cc: Mike Rapoport , Wolfram Sang , Tejun Heo , Ryan Mallon , linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, sfr@canb.auug.org.au, Linus Torvalds 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 > > > > > > 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 > > Acked-by: Ryan Mallon > > Acked-by: Mike Rapoport > > 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@gmail.com irc://irc.freenode.net/bd2