diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:09 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:09 -0400 |
| commit | 724d054490883fed2d7e5fc716dffa7675476740 (patch) | |
| tree | 5f090f26956bdac7ed91cc05acecffdd876675f5 /drivers/regulator/Makefile | |
| parent | 446b4665e323a755d5c5390da324134645a809fb (diff) | |
| parent | d295f7670127eb241d81e96e003b380c77c2b254 (diff) | |
Merge remote-tracking branch 'regulator/topic/helpers' into regulator-next
Diffstat (limited to 'drivers/regulator/Makefile')
| -rw-r--r-- | drivers/regulator/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 40cbb1b35c1d..90c31e74ca28 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | obj-$(CONFIG_REGULATOR) += core.o dummy.o fixed-helper.o | 6 | obj-$(CONFIG_REGULATOR) += core.o dummy.o fixed-helper.o helpers.o |
| 7 | obj-$(CONFIG_OF) += of_regulator.o | 7 | obj-$(CONFIG_OF) += of_regulator.o |
| 8 | obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o | 8 | obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o |
| 9 | obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o | 9 | obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o |