From: Mark Brown Date: Sun, 30 Apr 2017 13:17:44 +0000 (+0900) Subject: Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next X-Git-Tag: Ubuntu-5.13.0-19.19~13568^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ae53b5dbafc9713359696a9cff7e25f2aeaafada;p=mirror_ubuntu-jammy-kernel.git Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next --- ae53b5dbafc9713359696a9cff7e25f2aeaafada diff --cc drivers/regulator/Makefile index f30cb0e2d6fb,e246e148a7f9..dc3503fb3e30 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@@ -107,8 -104,8 +107,9 @@@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o +obj-$(CONFIG_REGULATOR_TPS65132) += tps65132-regulator.o obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o twl6030-regulator.o + obj-$(CONFIG_REGULATOR_VCTRL) += vctrl-regulator.o obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress-regulator.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o