From: Peter Huewe Date: Wed, 12 May 2010 23:54:57 +0000 (+0200) Subject: ds2782_battery: Rename get_current to fix build failure / name conflict X-Git-Tag: v2.6.35~24^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb9650d6d989f24f21232a055d8fd45f1a9dcf99;p=pandora-kernel.git ds2782_battery: Rename get_current to fix build failure / name conflict 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: drivers/power/ds2782_battery.c:216:48: error: macro "get_current" passed 2 arguments, but takes just This patch fixes the issue. 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 Signed-off-by: Anton Vorontsov --- Reading git-diff-tree failed