Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 23 insertions, 2 deletions

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index cea6cef27e89..faaa9b4d0d07 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,6 +29,20 @@ 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
@@ -77,6 +91,13 @@ config BATTERY_TOSA
           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
@@ -84,10 +105,10 @@ config BATTERY_WM97XX
           Say Y to enable support for battery measured by WM97xx aux port.
 
 config BATTERY_BQ27x00
-        tristate "BQ27200 battery driver"
+        tristate "BQ27x00 battery driver"
         depends on I2C
         help
-          Say Y here to enable support for batteries with BQ27200(I2C) chip.
+          Say Y here to enable support for batteries with BQ27x00 (I2C) chips.
 
 config BATTERY_DA9030
         tristate "DA9030 battery driver"