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

* git://git.infradead.org/battery-2.6:
  power_supply: Mark twl4030_charger as broken
This commit is contained in:
Linus Torvalds 2010-10-28 08:35:15 -07:00
commit 1df1a4cbcd

View File

@ -182,6 +182,7 @@ config CHARGER_ISP1704
config CHARGER_TWL4030 config CHARGER_TWL4030
tristate "OMAP TWL4030 BCI charger driver" tristate "OMAP TWL4030 BCI charger driver"
depends on TWL4030_CORE depends on TWL4030_CORE
depends on BROKEN
help help
Say Y here to enable support for TWL4030 Battery Charge Interface. Say Y here to enable support for TWL4030 Battery Charge Interface.