diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 11:35:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 11:35:15 -0400 |
| commit | 1df1a4cbcd33cf66111293c654dcff0199d965f0 (patch) | |
| tree | c6926cda1a53e48bffbcc9ff4a64dc307767b5fa /drivers | |
| 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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 60d83d983a36..ec444774b9ee 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -182,6 +182,7 @@ config CHARGER_ISP1704 | |||
| 182 | config CHARGER_TWL4030 | 182 | config CHARGER_TWL4030 |
| 183 | tristate "OMAP TWL4030 BCI charger driver" | 183 | tristate "OMAP TWL4030 BCI charger driver" |
| 184 | depends on TWL4030_CORE | 184 | depends on TWL4030_CORE |
| 185 | depends on BROKEN | ||
| 185 | help | 186 | help |
| 186 | Say Y here to enable support for TWL4030 Battery Charge Interface. | 187 | Say Y here to enable support for TWL4030 Battery Charge Interface. |
| 187 | 188 | ||