[GIT PULL] battery-2.6.git (a last minute fix)

[Anton Vorontsov <cbouatmailru@gmail.com>]

On Thu, Oct 28, 2010 at 12:07:10AM -0700, Andrew Morton wrote:
[...]
> > The new driver does not build at its own commit point either, as the missing symbol 
> > definition is simply not there. It appears that commit 2e727f1 could not have been 
> > build-tested by anyone before it got upstream (let alone boot and functionality 
> > tested). As a temporary workaround i'm disabling it in -tip.
> > 
> 
> Those definitions get added by the MFD tree and used by the battery
> tree.  Things arrived in the wrong order (and, yes, didn't get tested).

My bad. :-/

> The fix is for Samuel to get a wiggle on with his merge?  The -rc1
> window is about to slam shut on his fingers anyway.

I guess the best thing for now would be to be safe and to disable
the new driver via 'depends on BROKEN', so it won't scare testers
away from -rc1.

Linus,

Please pull battery-2.6.git tree again, this is to disable the
non-buildable (as it appears w/o MFD tree) driver.

The following changes since commit 81280572ca6f54009edfa4deee563e8678784218:
  Linus Torvalds (1):
        Merge branch 'upstream-merge' of git://git.kernel.org/.../tytso/ext4

are available in the git repository at:

  git://git.infradead.org/battery-2.6.git master

Anton Vorontsov (1):
      power_supply: Mark twl4030_charger as broken

 drivers/power/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


commit 23886839a752401aba66517bff8a8b91549279ce
Author: Anton Vorontsov <cbouatmailru@gmail.com>
Date:   Thu Oct 28 12:44:16 2010 +0400

    power_supply: Mark twl4030_charger as broken
    
    The driver is not buildable without MFD changes. For now, let's
    disable the driver as it breaks build for major platforms (i.e. x86).
    
      CC [M]  drivers/power/twl4030_charger.o
    drivers/power/twl4030_charger.c: In function 'twl4030_clear_set_boot_bci':
    drivers/power/twl4030_charger.c:105: error: 'TWL4030_PM_MASTER_BOOT_BCI' undeclared (first use in this function)
    drivers/power/twl4030_charger.c:105: error: (Each undeclared identifier is reported only once
    drivers/power/twl4030_charger.c:105: error: for each function it appears in.)
    drivers/power/twl4030_charger.c: In function 'twl4030_bci_have_vbus':
    drivers/power/twl4030_charger.c:137: error: 'TWL4030_PM_MASTER_STS_HW_CONDITIONS' undeclared (first use in this function)
    drivers/power/twl4030_charger.c: In function 'twl4030_bci_probe':
    drivers/power/twl4030_charger.c:477: warning: overflow in implicit constant conversion
    drivers/power/twl4030_charger.c:485: warning: overflow in implicit constant conversion
    make[2]: *** [drivers/power/twl4030_charger.o] Error 1
    
    We can re-enable it if MFD tree will finally merge into 2.6.37.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 60d83d9..ec44477 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -182,6 +182,7 @@ config CHARGER_ISP1704
 config CHARGER_TWL4030
 	tristate "OMAP TWL4030 BCI charger driver"
 	depends on TWL4030_CORE
+	depends on BROKEN
 	help
 	  Say Y here to enable support for TWL4030 Battery Charge Interface.