Merge branch 'omap-fixes'

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

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 668472405a57a9f951ef8e510082ff94db039504..aad68dbd486c0ebae7b258956892e8bac1b4ebef 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -63,6 +63,13 @@ config BATTERY_TOSA
          Say Y to enable support for the battery on the Sharp Zaurus
          SL-6000 (tosa) models.
 
+config TWL4030_BCI_BATTERY
+       tristate "OMAP TWL4030 BCI Battery driver"
+       depends on TWL4030_CORE && TWL4030_MADC
+       help
+         Support for OMAP TWL4030 BCI Battery driver.
+         This driver can give support for TWL4030 Battery Charge Interface.
+
 config BATTERY_WM97XX
        bool "WM97xx generic battery driver"
        depends on TOUCHSCREEN_WM97XX=y
@@ -82,4 +89,10 @@ config BATTERY_DA9030
          Say Y here to enable support for batteries charger integrated into
          DA9030 PMIC.
 
+config CHARGER_PCF50633
+       tristate "NXP PCF50633 MBC"
+       depends on MFD_PCF50633
+       help
+        Say Y to include support for NXP PCF50633 Main Battery Charger.
+
 endif # POWER_SUPPLY