Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[~andy/linux] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index faaa9b4d0d0711ea2fc2420f37cbe62959891ba9..1e5506be39b4b1a4c58d1e818761bbfb3dd9a3c9 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -57,6 +57,11 @@ config WM8350_POWER
           Say Y here to enable support for the power management unit
          provided by the Wolfson Microelectronics WM8350 PMIC.
 
+config TEST_POWER
+       tristate "Test power driver"
+       help
+         This driver is used for testing. It's safe to say M here.
+
 config BATTERY_DS2760
        tristate "DS2760 battery driver (HP iPAQ & others)"
        select W1
@@ -65,10 +70,10 @@ config BATTERY_DS2760
          Say Y here to enable support for batteries with ds2760 chip.
 
 config BATTERY_DS2782
-       tristate "DS2782 standalone gas-gauge"
+       tristate "DS2782/DS2786 standalone gas-gauge"
        depends on I2C
        help
-         Say Y here to enable support for the DS2782 standalone battery
+         Say Y here to enable support for the DS2782/DS2786 standalone battery
          gas-gauge.
 
 config BATTERY_PMU
@@ -125,10 +130,27 @@ config BATTERY_MAX17040
          in handheld and portable equipment. The MAX17040 is configured
          to operate with a single lithium cell
 
+config BATTERY_Z2
+       tristate "Z2 battery driver"
+       depends on I2C && MACH_ZIPIT2
+       help
+         Say Y to include support for the battery on the Zipit Z2.
+
 config CHARGER_PCF50633
        tristate "NXP PCF50633 MBC"
        depends on MFD_PCF50633
        help
         Say Y to include support for NXP PCF50633 Main Battery Charger.
 
+config BATTERY_JZ4740
+       tristate "Ingenic JZ4740 battery"
+       depends on MACH_JZ4740
+       depends on MFD_JZ4740_ADC
+       help
+         Say Y to enable support for the battery on Ingenic JZ4740 based
+         boards.
+
+         This driver can be build as a module. If so, the module will be
+         called jz4740-battery.
+
 endif # POWER_SUPPLY