Merge current mainline 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 4d17d384578d7214ccbd08cac71d5b9c8a1809b1..c0a3036cfaaaef01c22ceb260d57b2c5631773bd 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -49,6 +49,42 @@ 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 || MACH_OMAP_LDP) && 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
+       help
+         Say Y to enable support for the battery on the Sharp Zaurus
+         SL-6000 (tosa) models.
+
 config BATTERY_PALMTX
        tristate "Palm T|X battery"
        depends on MACH_PALMTX