diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 14:35:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 14:35:57 -0700 |
commit | f27884aeadff9654f4a1e8a05dd92f4b140afe29 (patch) | |
tree | 22db0c732fcc4e68be25190454631ee1d249e295 /drivers/power/Kconfig | |
parent | c6223048259006759237d826219f0fa4f312fb47 (diff) | |
parent | a35d01a5d2ac533edab94a8e3b6749ab213c91c5 (diff) | |
download | kernel_samsung_crespo-f27884aeadff9654f4a1e8a05dd92f4b140afe29.zip kernel_samsung_crespo-f27884aeadff9654f4a1e8a05dd92f4b140afe29.tar.gz kernel_samsung_crespo-f27884aeadff9654f4a1e8a05dd92f4b140afe29.tar.bz2 |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
da9030_battery: Fix race between event handler and monitor
Add MAX17040 Fuel Gauge driver
w1: ds2760_battery: add support for sleep mode feature
w1: ds2760: add support for EEPROM read and write
ds2760_battery: cleanups in ds2760_battery_probe()
Diffstat (limited to 'drivers/power/Kconfig')
-rw-r--r-- | drivers/power/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 33da112..7eda348 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -82,6 +82,14 @@ config BATTERY_DA9030 Say Y here to enable support for batteries charger integrated into DA9030 PMIC. +config BATTERY_MAX17040 + tristate "Maxim MAX17040 Fuel Gauge" + depends on I2C + help + MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries + in handheld and portable equipment. The MAX17040 is configured + to operate with a single lithium cell + config CHARGER_PCF50633 tristate "NXP PCF50633 MBC" depends on MFD_PCF50633 |