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

[safe/jmp/linux-2.6] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index b2bd104..33da112 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,6 +29,13 @@ config APM_POWER
          Say Y here to enable support APM status emulation using
          battery class devices.
 
+config WM8350_POWER
+        tristate "WM8350 PMU support"
+        depends on MFD_WM8350
+        help
+          Say Y here to enable support for the power management unit
+         provided by the Wolfson Microelectronics WM8350 PMIC.
+
 config BATTERY_DS2760
        tristate "DS2760 battery driver (HP iPAQ & others)"
        select W1
@@ -51,16 +58,16 @@ config BATTERY_OLPC
 
 config BATTERY_TOSA
        tristate "Sharp SL-6000 (tosa) battery"
-       depends on MACH_TOSA && MFD_TC6393XB
+       depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX
        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
+config BATTERY_WM97XX
+       bool "WM97xx generic battery driver"
+       depends on TOUCHSCREEN_WM97XX=y
        help
-         Say Y to enable support for the battery in Palm T|X.
+         Say Y to enable support for battery measured by WM97xx aux port.
 
 config BATTERY_BQ27x00
        tristate "BQ27200 battery driver"
@@ -68,4 +75,17 @@ config BATTERY_BQ27x00
        help
          Say Y here to enable support for batteries with BQ27200(I2C) chip.
 
+config BATTERY_DA9030
+       tristate "DA9030 battery driver"
+       depends on PMIC_DA903X
+       help
+         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