diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 19:27:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 19:27:24 -0500 |
| commit | b743791639d8142277df1c2814c282e3ad752f06 (patch) | |
| tree | 27e09f48e6c28b8695c343dbd3d8dedb0a92b3a4 /drivers/power/Kconfig | |
| parent | 9219a3b9889dbc7dae68e472f239672ff48860b0 (diff) | |
| parent | b29c06ae96acc47e866f29d19075707f91df69c8 (diff) | |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd:
mfd: Fix twl4030-core build
mfd: Ensure sm501 GPIO pin mode is GPIO when configured
mfd: dm355 evm MMC/SD card detection
regulator: PCF50633 pmic driver
input: PCF50633 input driver
power_supply: PCF50633 battery charger driver
rtc: PCF50633 rtc driver
mfd: PCF50633 gpio support
mfd: PCF50633 adc driver
mfd: PCF50633 core driver
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 668472405a57..33da1127992a 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -82,4 +82,10 @@ config BATTERY_DA9030 | |||
| 82 | Say Y here to enable support for batteries charger integrated into | 82 | Say Y here to enable support for batteries charger integrated into |
| 83 | DA9030 PMIC. | 83 | DA9030 PMIC. |
| 84 | 84 | ||
| 85 | config CHARGER_PCF50633 | ||
| 86 | tristate "NXP PCF50633 MBC" | ||
| 87 | depends on MFD_PCF50633 | ||
| 88 | help | ||
| 89 | Say Y to include support for NXP PCF50633 Main Battery Charger. | ||
| 90 | |||
| 85 | endif # POWER_SUPPLY | 91 | endif # POWER_SUPPLY |