Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 1ddd13cc0c07ec9ac5b36715133ed6b7b1669450..421770ddafa3c5ceb9f38e8cb35c2453b3dd2312 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -75,6 +75,13 @@ config BATTERY_88PM860X
        help
          Say Y here to enable battery monitor for Marvell 88PM860x chip.
 
+config BATTERY_ACT8945A
+       tristate "Active-semi ACT8945A charger driver"
+       depends on MFD_ACT8945A || COMPILE_TEST
+       help
+         Say Y here to enable support for power supply provided by
+         Active-semi ActivePath ACT8945A charger.
+
 config BATTERY_DS2760
        tristate "DS2760 battery driver (HP iPAQ & others)"
        depends on W1 && W1_SLAVE_DS2760