Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 9ce55850271a17c21365dee317f43219756eff53..7bd8c2b415756424e74bf50faad18285a4afdcaf 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -49,6 +49,35 @@ config BATTERY_OLPC
        help
          Say Y to enable support for the battery on the OLPC laptop.
 
+config BATTERY_BQ27x00
+       tristate "BQ27x00 battery driver"
+       help
+         Say Y here to enable support for batteries with BQ27000 or BQ27200 chip.
+
+config BATTERY_BQ27000
+       bool "BQ27000 battery driver"
+       depends on BATTERY_BQ27x00
+       select W1
+       select W1_SLAVE_BQ27000
+       help
+         Say Y here to enable support for batteries with BQ27000(HDQ) chip.
+
+config BATTERY_BQ27200
+       bool "BQ27200 battery driver"
+       depends on BATTERY_BQ27x00
+       select I2C
+       select I2C_OMAP
+       help
+         Say Y here to enable support for batteries with BQ27200(I2C) chip.
+
+config TWL4030_BCI_BATTERY
+       tristate "OMAP TWL4030 BCI Battery driver"
+       depends on (MACH_OMAP_2430SDP || MACH_OMAP_3430SDP) && TWL4030_MADC
+       default y
+       help
+         Support for OMAP TWL4030 BCI Battery driver.
+         This driver can give support for TWL4030 Battery Charge Interface.
+
 config BATTERY_TOSA
        tristate "Sharp SL-6000 (tosa) battery"
        depends on MACH_TOSA && MFD_TC6393XB