summaryrefslogtreecommitdiff
path: root/drivers/power/Kconfig
diff options
context:
space:
mode:
authorAnton Vorontsov <anton@enomsg.org>2013-02-03 07:25:57 +0400
committerAnton Vorontsov <anton@enomsg.org>2013-02-03 07:29:13 +0400
commit58a1c154d449aae97a8ecad67ddbfd4024ac8446 (patch)
tree4d09553a369094149646e3018aa908b9e1294dba /drivers/power/Kconfig
parenteeb0751c99522a4d1bbcc7b6bc1460cd07d07488 (diff)
parent34c11a709e928090cf34ecd706f7d3170f4e5026 (diff)
downloadlinux-58a1c154d449aae97a8ecad67ddbfd4024ac8446.tar.xz
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/Kconfig7
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