diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:42:59 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:42:59 -0500 |
| commit | f675649e70a494aa13ae695480a3d51bf15dd3e2 (patch) | |
| tree | 50d8a96423d2df98cc82c92db6303d396545bb33 /drivers/regulator/Makefile | |
| parent | 9199addf4f326bf1c09a8cbd8596b411b9e92eab (diff) | |
| parent | 56968658ff8564e9f264b4bcb4f2ab98f70146a2 (diff) | |
Merge remote-tracking branch 'regulator/topic/max8973' 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 73bfb873d4b8..b802b0c7fb02 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile | |||
| @@ -36,6 +36,7 @@ obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o | |||
| 36 | obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o | 36 | obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o |
| 37 | obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o | 37 | obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o |
| 38 | obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o | 38 | obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o |
| 39 | obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o | ||
| 39 | obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o | 40 | obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o |
| 40 | obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o | 41 | obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o |
| 41 | obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o | 42 | obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o |