diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:04:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:04:09 -0800 |
| commit | 8e128ce3318a147903c893de1891f6c2306f8a61 (patch) | |
| tree | 3b45e780570e9beb9ec8e83c677f2d9fd9b458ce /drivers/power/Kconfig | |
| parent | 0bbb2753584231db364b624bf8cf82551b94da7d (diff) | |
| parent | 3f874b6643e189d3d07618928ceed0013d71593e (diff) | |
| download | kernel_samsung_smdk4412-8e128ce3318a147903c893de1891f6c2306f8a61.zip kernel_samsung_smdk4412-8e128ce3318a147903c893de1891f6c2306f8a61.tar.gz kernel_samsung_smdk4412-8e128ce3318a147903c893de1891f6c2306f8a61.tar.bz2 | |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd: (30 commits)
mfd: Fix section mismatch in da903x
mfd: move drivers/i2c/chips/menelaus.c to drivers/mfd
mfd: move drivers/i2c/chips/tps65010.c to drivers/mfd
mfd: dm355evm msp430 driver
mfd: Add missing break from wm3850-core
mfd: Add WM8351 support
mfd: Support configurable numbers of DCDCs and ISINKs on WM8350
mfd: Handle missing WM8350 platform data
mfd: Add WM8352 support
mfd: Use irq_to_desc in twl4030 code
power_supply: Add Dialog DA9030 battery charger driver
mfd: Dialog DA9030 battery charger MFD driver
mfd: Register WM8400 codec device
mfd: Pass driver_data onto child devices
mfd: Fix twl4030-core.c build error
mfd: twl4030 regulator bug fixes
mfd: twl4030: create some regulator devices
mfd: twl4030: cleanup symbols and OMAP dependency
mfd: twl4030: simplified child creation code
power_supply: Add battery health reporting for WM8350
...
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 8e0c2b4..6684724 100644 --- 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 @@ -68,4 +75,11 @@ config BATTERY_BQ27x00 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 |