Merge git://git.infradead.org/battery-2.6

[net-next-2.6.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index d1d3c7006eac253c08ccb154ec61860ed8a6f0db..07343568a12ec81ca6b8948e6754190b5ce9a49e 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -148,6 +148,17 @@ config CHARGER_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.
+
 config BATTERY_INTEL_MID
        tristate "Battery driver for Intel MID platforms"
        depends on INTEL_SCU_IPC && SPI