-tip: origin tree build failure (battery-2.6.git related)

[Ingo Molnar <mingo@elte.hu>]

Hi,

* Anton Vorontsov <cbouatmailru@gmail.com> wrote:

> Hello Linus,
> 
> Please pull battery-2.6.git tree to receive changes prepared for
> 2.6.37.
> 
> There are three new drivers, various small cleanups and bug fixes.
> [...]
>
> Grazvydas Ignotas (1):
>       power_supply: Add driver for TWL4030/TPS65950 BCI charger

Today's -tip fails to build due to upstream commit 2e727f1 ("power_supply: Add 
driver for TWL4030/TPS65950 BCI charger"), on every x86 build that has this driver 
enabled (for example allyesconfig or allmodconfig):

 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)

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.

Thanks,

	Ingo