diff options
| author | Sebastian Reichel <sre@kernel.org> | 2020-05-28 09:04:26 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2020-05-28 09:04:26 +0200 |
| commit | 6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9 (patch) | |
| tree | 1d686ed8397fecd27c7ced47078945c2af3c5893 /drivers/power/supply/Makefile | |
| parent | c3d80522237b71480109fc397975fe4146ed2550 (diff) | |
| parent | 904ac71f4b0c1c26ec47ff597cb3d3c7d36e618d (diff) | |
Merge tag 'tags/ib-mfd-iio-power-v5.8' into psy-next
This merges the MP2629 battery charge management immutable branch
between MFD, IIO and power-supply due for the v5.8 merge window
into power-supply for-next branch.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply/Makefile')
| -rw-r--r-- | drivers/power/supply/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index bb934545103d..b9644663e435 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -76,6 +76,7 @@ obj-$(CONFIG_CHARGER_MAX77650) += max77650-charger.o obj-$(CONFIG_CHARGER_MAX77693) += max77693_charger.o obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o +obj-$(CONFIG_CHARGER_MP2629) += mp2629_charger.o obj-$(CONFIG_CHARGER_QCOM_SMBB) += qcom_smbb.o obj-$(CONFIG_CHARGER_BQ2415X) += bq2415x_charger.o obj-$(CONFIG_CHARGER_BQ24190) += bq24190_charger.o |