diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:06 +0100 |
commit | 59aedb6df1f80cf9da7762a65450f616455898bb (patch) | |
tree | 1d2660a6753d9270216266e4bcac2222130ac07c /drivers/regulator/Makefile | |
parent | c84130e7006cacf05e8691ed4d6e5796910dac03 (diff) | |
parent | d26ec830f5d7345cc501ff6fe9d44c7e23930432 (diff) | |
download | linux-59aedb6df1f80cf9da7762a65450f616455898bb.tar.bz2 |
Merge remote-tracking branch 'regulator/topic/abb' 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 c4b50fc7f44f..ba4a3cf3afec 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o +obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o |