diff options
author | Mark Brown <broonie@kernel.org> | 2017-04-30 22:17:44 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-04-30 22:17:44 +0900 |
commit | ae53b5dbafc9713359696a9cff7e25f2aeaafada (patch) | |
tree | 4cd043b9f6871ea72a8d64acfff65b6f17c315ff /drivers/regulator/Makefile | |
parent | 81bc8e386f394961b22cb0758c78cee8e0905233 (diff) | |
parent | a9bbb453b50c91295ab362e4832eb37fd4e6785d (diff) | |
download | linux-ae53b5dbafc9713359696a9cff7e25f2aeaafada.tar.bz2 |
Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next
Diffstat (limited to 'drivers/regulator/Makefile')
-rw-r--r-- | drivers/regulator/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index f30cb0e2d6fb..dc3503fb3e30 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -109,6 +109,7 @@ 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 |