diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-02-03 04:25:57 +0100 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-02-03 04:29:13 +0100 |
| commit | 58a1c154d449aae97a8ecad67ddbfd4024ac8446 (patch) | |
| tree | 4d09553a369094149646e3018aa908b9e1294dba /drivers/power/Kconfig | |
| parent | ab8500_btemp: Demote initcall sequence (diff) | |
| parent | u8500-charger: Delay for USB enumeration (diff) | |
| download | linux-58a1c154d449aae97a8ecad67ddbfd4024ac8446.tar.xz linux-58a1c154d449aae97a8ecad67ddbfd4024ac8446.zip | |
Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Pull a huge ab8500/pm2301 pile of changes from Lee Jones. Lee did an
awesome job cleaning this stuff up and thus brought ab8500 Stericsson's
development tree much closer to the mainline. Even more changes to come,
though.
Conflicts:
drivers/power/Kconfig
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 1ae51551c9ff..1e4719790a94 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -352,6 +352,13 @@ config BATTERY_GOLDFISH Say Y to enable support for the battery and AC power in the Goldfish emulator. +config CHARGER_PM2301 + bool "PM2301 Battery Charger Driver" + depends on AB8500_BM + help + Say Y to include support for PM2301 charger driver. + Depends on AB8500 battery management core. + source "drivers/power/reset/Kconfig" endif # POWER_SUPPLY |