summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 08:35:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 08:35:15 -0700
commit1df1a4cbcd33cf66111293c654dcff0199d965f0 (patch)
treec6926cda1a53e48bffbcc9ff4a64dc307767b5fa
parented2e5581d2702743460349e494f3ab8c4b0f28d8 (diff)
parent23886839a752401aba66517bff8a8b91549279ce (diff)
downloadop-kernel-dev-1df1a4cbcd33cf66111293c654dcff0199d965f0.zip
op-kernel-dev-1df1a4cbcd33cf66111293c654dcff0199d965f0.tar.gz
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply: Mark twl4030_charger as broken
-rw-r--r--drivers/power/Kconfig1
1 files changed, 1 insertions, 0 deletions
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.
OpenPOWER on IntegriCloud