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/mfd/Makefile | |
| parent | c3d80522237b71480109fc397975fe4146ed2550 (diff) | |
| parent | 904ac71f4b0c1c26ec47ff597cb3d3c7d36e618d (diff) | |
| download | linux-stable-6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9.tar.gz linux-stable-6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9.tar.bz2 linux-stable-6c2fe5cae53a4b32276b71a72b003fb3ec83c7f9.zip | |
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/mfd/Makefile')
| -rw-r--r-- | drivers/mfd/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index f935d10cbf0f..d6c210f96d02 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -170,6 +170,8 @@ obj-$(CONFIG_MFD_MAX8925) += max8925.o obj-$(CONFIG_MFD_MAX8997) += max8997.o max8997-irq.o obj-$(CONFIG_MFD_MAX8998) += max8998.o max8998-irq.o +obj-$(CONFIG_MFD_MP2629) += mp2629.o + pcf50633-objs := pcf50633-core.o pcf50633-irq.o obj-$(CONFIG_MFD_PCF50633) += pcf50633.o obj-$(CONFIG_PCF50633_ADC) += pcf50633-adc.o |