Commit 1df1a4cb authored by Linus Torvalds's avatar Linus Torvalds

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

* git://git.infradead.org/battery-2.6:
  power_supply: Mark twl4030_charger as broken
parents ed2e5581 23886839
...@@ -182,6 +182,7 @@ config CHARGER_ISP1704 ...@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment