Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

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

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 63bb579104452f0c8228e7fbbf5bccedcb37f8f6..668472405a57a9f951ef8e510082ff94db039504 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,7 +58,7 @@ 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.
@@ -62,4 +69,17 @@ config BATTERY_WM97XX
        help
          Say Y to enable support for battery measured by WM97xx aux port.
 
+config BATTERY_BQ27x00
+       tristate "BQ27200 battery driver"
+       depends on I2C
+       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.
+
 endif # POWER_SUPPLY