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 7811fa6..33da112 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -14,4 +14,78 @@ config POWER_SUPPLY_DEBUG
          Say Y here to enable debugging messages for power supply class
          and drivers.
 
+config PDA_POWER
+       tristate "Generic PDA/phone power driver"
+       depends on !S390
+       help
+         Say Y here to enable generic power driver for PDAs and phones with
+         one or two external power supplies (AC/USB) connected to main and
+         backup batteries, and optional builtin charger.
+
+config APM_POWER
+       tristate "APM emulation for class batteries"
+       depends on APM_EMULATION
+       help
+         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
+       select W1_SLAVE_DS2760
+       help
+         Say Y here to enable support for batteries with ds2760 chip.
+
+config BATTERY_PMU
+       tristate "Apple PMU battery"
+       depends on PPC32 && ADB_PMU
+       help
+         Say Y here to expose battery information on Apple machines
+         through the generic battery class.
+
+config BATTERY_OLPC
+       tristate "One Laptop Per Child battery"
+       depends on X86_32 && OLPC
+       help
+         Say Y to enable support for the battery on the OLPC laptop.
+
+config BATTERY_TOSA
+       tristate "Sharp SL-6000 (tosa) battery"
+       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_WM97XX
+       bool "WM97xx generic battery driver"
+       depends on TOUCHSCREEN_WM97XX=y
+       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.
+
+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