diff options
| author | Sebastian Reichel <sre@kernel.org> | 2014-09-24 19:55:14 -0400 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-09-24 19:55:14 -0400 |
| commit | fd642bb94c75f08ed15111a7fe75027da6abdd07 (patch) | |
| tree | 0940fb421270eb0fb80f9700f90335c8acf6672a /drivers/power/Kconfig | |
| parent | 4d96fb1ec81118c6406fe6d3670f172b2faaedf3 (diff) | |
| parent | d6cc1f5824cbca392d099f3bb0c441efd9e54de9 (diff) | |
Merge tag 'tags/mfd-power-charger-regulator-v3.18' into next
Immutable branch between MFD, Power, Charger and Regulator for v3.18
Diffstat (limited to 'drivers/power/Kconfig')
| -rw-r--r-- | drivers/power/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 73cfcdf28a36..04e1d2fe2201 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
| @@ -325,11 +325,12 @@ config CHARGER_MANAGER | |||
| 325 | with help of suspend_again support. | 325 | with help of suspend_again support. |
| 326 | 326 | ||
| 327 | config CHARGER_MAX14577 | 327 | config CHARGER_MAX14577 |
| 328 | tristate "Maxim MAX14577 MUIC battery charger driver" | 328 | tristate "Maxim MAX14577/77836 battery charger driver" |
| 329 | depends on MFD_MAX14577 | 329 | depends on MFD_MAX14577 |
| 330 | select SYSFS | ||
| 330 | help | 331 | help |
| 331 | Say Y to enable support for the battery charger control sysfs and | 332 | Say Y to enable support for the battery charger control sysfs and |
| 332 | platform data of MAX14577 MUICs. | 333 | platform data of MAX14577/77836 MUICs. |
| 333 | 334 | ||
| 334 | config CHARGER_MAX8997 | 335 | config CHARGER_MAX8997 |
| 335 | tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver" | 336 | tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver" |