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 1e5506be39b4b1a4c58d1e818761bbfb3dd9a3c9..07343568a12ec81ca6b8948e6754190b5ce9a49e 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -136,6 +136,12 @@ config BATTERY_Z2
        help
          Say Y to include support for the battery on the Zipit Z2.
 
+config BATTERY_S3C_ADC
+       tristate "Battery driver for Samsung ADC based monitoring"
+       depends on S3C_ADC
+       help
+         Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
+
 config CHARGER_PCF50633
        tristate "NXP PCF50633 MBC"
        depends on MFD_PCF50633
@@ -153,4 +159,11 @@ config BATTERY_JZ4740
          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
+       help
+         Say Y here to enable the battery driver on Intel MID
+         platforms.
+
 endif # POWER_SUPPLY