projects/linux·commit 1df1a4cb

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

1df1a4cb · Linus Torvalds <[email protected]> · 2010-10-28 08:35:15 -07:00

* git://git.infradead.org/battery-2.6:
  power_supply: Mark twl4030_charger as broken
Commit
1df1a4cbcd33cf66111293c654dcff0199d965f0
Parents
ed2e5581 · 23886839

Merge commit. Changes below are compared with the first parent: ed2e5581.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
drivers/power/Kconfigmodified+1−0View file

drivers/power/Kconfig

View file
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.