diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:59:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:59:33 -0500 |
| commit | 48e902f0a3aea4b6b3a73e9d277b92024a493e6d (patch) | |
| tree | 6dbb3a4c5ab4e7fc72172d8c11e7c0418b6559d1 /drivers/power/Kconfig | |
| parent | 7f6cd5408a8ace522ca7f15893243e94ccc913e0 (diff) | |
| parent | 9d233e8bb92e355fd20b14745c1d9ff402e0e685 (diff) | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
power_supply_sysfs: Handle -ENODATA in a special way
wm831x_backup: Remove unused variables
gta02: Set pcf50633 charger_reference_current_ma
pcf50633: Query charger status directly
pcf50633: Properly reenable charging when the supply conditions change
pcf50633: Get rid of charging restart software auto-triggering
pcf50633: introduces battery charging current control
pcf50633: Add ac power supply class to the charger
wm831x: Factor out WM831x backup battery charger
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 118674925516..d4b3d67f0548 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -29,6 +29,13 @@ config APM_POWER | |||
| 29 | Say Y here to enable support APM status emulation using | 29 | Say Y here to enable support APM status emulation using |
| 30 | battery class devices. | 30 | battery class devices. |
| 31 | 31 | ||
| 32 | config WM831X_BACKUP | ||
| 33 | tristate "WM831X backup battery charger support" | ||
| 34 | depends on MFD_WM831X | ||
| 35 | help | ||
| 36 | Say Y here to enable support for the backup battery charger | ||
| 37 | in the Wolfson Microelectronics WM831x PMICs. | ||
| 38 | |||
| 32 | config WM831X_POWER | 39 | config WM831X_POWER |
| 33 | tristate "WM831X PMU support" | 40 | tristate "WM831X PMU support" |
| 34 | depends on MFD_WM831X | 41 | depends on MFD_WM831X |