w1: fix omap 1-wire driver compilation

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

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 58c806e..faaa9b4 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,6 +29,34 @@ config APM_POWER
          Say Y here to enable support APM status emulation using
          battery class devices.
 
+config MAX8925_POWER
+       tristate "MAX8925 battery charger support"
+       depends on MFD_MAX8925
+       help
+         Say Y here to enable support for the battery charger in the Maxim
+         MAX8925 PMIC.
+
+config WM831X_BACKUP
+       tristate "WM831X backup battery charger support"
+       depends on MFD_WM831X
+       help
+         Say Y here to enable support for the backup battery charger
+         in the Wolfson Microelectronics WM831x PMICs.
+
+config WM831X_POWER
+       tristate "WM831X PMU support"
+       depends on MFD_WM831X
+       help
+         Say Y here to enable support for the power management unit
+         provided by Wolfson Microelectronics WM831x PMICs.
+
+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
@@ -36,6 +64,13 @@ config BATTERY_DS2760
        help
          Say Y here to enable support for batteries with ds2760 chip.
 
+config BATTERY_DS2782
+       tristate "DS2782 standalone gas-gauge"
+       depends on I2C
+       help
+         Say Y here to enable support for the DS2782 standalone battery
+         gas-gauge.
+
 config BATTERY_PMU
        tristate "Apple PMU battery"
        depends on PPC32 && ADB_PMU
@@ -49,4 +84,51 @@ config BATTERY_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_COLLIE
+       tristate "Sharp SL-5500 (collie) battery"
+       depends on SA1100_COLLIE && MCP_UCB1200
+       help
+         Say Y to enable support for the battery on the Sharp Zaurus
+         SL-5500 (collie) 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 "BQ27x00 battery driver"
+       depends on I2C
+       help
+         Say Y here to enable support for batteries with BQ27x00 (I2C) chips.
+
+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 BATTERY_MAX17040
+       tristate "Maxim MAX17040 Fuel Gauge"
+       depends on I2C
+       help
+         MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries
+         in handheld and portable equipment. The MAX17040 is configured
+         to operate with a single lithium cell
+
+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