diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-28 12:17:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-28 12:17:00 +0100 |
| commit | fdaff15ae6cc8745b9b56adab0252729b476ed7e (patch) | |
| tree | 182eb140d5c71501159fb0d46ffc8b74c766dc13 /drivers/regulator/Makefile | |
| parent | d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3 (diff) | |
| parent | 9839d627c2a2c74facde9a9ee949f2ba0a1363b1 (diff) | |
| download | linux-stable-fdaff15ae6cc8745b9b56adab0252729b476ed7e.tar.gz linux-stable-fdaff15ae6cc8745b9b56adab0252729b476ed7e.tar.bz2 linux-stable-fdaff15ae6cc8745b9b56adab0252729b476ed7e.zip | |
Merge remote-tracking branch 'regulator/topic/sky81452' into regulator-drivers
Conflicts:
drivers/regulator/Kconfig
drivers/regulator/Makefile
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 2f49356e03a7..a4d81ec024ea 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o +obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.o obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o |