diff --git a/[refs] b/[refs] index e88ff89a0295..e6a561e8700c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1aebb0973160570e1df4c95c2e43a60993f71087 +refs/heads/master: c4727555d0bb2242047395dbcec253ea9d08a3b7 diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig index e3a3b4956f08..064d6c138298 100644 --- a/trunk/drivers/power/Kconfig +++ b/trunk/drivers/power/Kconfig @@ -268,6 +268,7 @@ config CHARGER_GPIO config CHARGER_MANAGER bool "Battery charger manager for multiple chargers" depends on REGULATOR && RTC_CLASS + select EXTCON help Say Y to enable charger-manager support, which allows multiple chargers attached to a battery and multiple batteries attached to a