commit | 1df1a4cbcd33cf66111293c654dcff0199d965f0 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 28 08:35:15 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 28 08:35:15 2010 -0700 |
tree | c6926cda1a53e48bffbcc9ff4a64dc307767b5fa | |
parent | ed2e5581d2702743460349e494f3ab8c4b0f28d8 [diff] | |
parent | 23886839a752401aba66517bff8a8b91549279ce [diff] |
Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: power_supply: Mark twl4030_charger as broken
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_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.