diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:40 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:40 -0400 |
| commit | aa11a358f88b371dee64a556eb7acc9ea05b0102 (patch) | |
| tree | 439035bd5fd20b04b3a2ac0200afd3f0319d42d2 /drivers/regulator/Makefile | |
| parent | 67471b6a242b182dd44afbd3848fcfe4065c6445 (diff) | |
| parent | 18dca93eb7faa8d90fbc54bfb08560caebbf92cd (diff) | |
Merge remote-tracking branch 'regulator/topic/stw481x' 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 828c6054960f..01c597ea1744 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile | |||
| @@ -57,6 +57,7 @@ obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o | |||
| 57 | obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o | 57 | obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o |
| 58 | obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o | 58 | obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o |
| 59 | obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o | 59 | obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o |
| 60 | obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o | ||
| 60 | obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o | 61 | obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o |
| 61 | obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o | 62 | obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o |
| 62 | obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o | 63 | obj-$(CONFIG_REGULATOR_TPS62360) += tps62360-regulator.o |