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 | c84130e7006cacf05e8691ed4d6e5796910dac03 (patch) | |
| tree | cab75a73d18547cf7857b417c4d44fb6aa23f688 /drivers/regulator/Makefile | |
| parent | 28120bf84929167d2a712f037a960add5e1584f5 (diff) | |
| parent | 08d49f4372ebee2b06d6988ecca37612fdc5b897 (diff) | |
| download | blackbird-op-linux-c84130e7006cacf05e8691ed4d6e5796910dac03.tar.gz blackbird-op-linux-c84130e7006cacf05e8691ed4d6e5796910dac03.zip | |
Merge remote-tracking branch 'regulator/topic/ab8500' 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 a4094cd274be..c4b50fc7f44f 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -12,7 +12,7 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o -obj-$(CONFIG_REGULATOR_AB8500) += ab8500.o ab8500-ext.o +obj-$(CONFIG_REGULATOR_AB8500) += ab8500-ext.o ab8500.o obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o |
