diff options
| author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-02-12 01:14:23 -0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-12 12:15:51 +0000 |
| commit | 96173cc6a4c4fca5a3a83e942b09474f791c395a (patch) | |
| tree | d519e1e00e231894f5041f6dffe550295e56632a /drivers | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | op-kernel-dev-96173cc6a4c4fca5a3a83e942b09474f791c395a.zip op-kernel-dev-96173cc6a4c4fca5a3a83e942b09474f791c395a.tar.gz | |
regulator: Rename files for max77686 and max77802 drivers
The max77686 and max77802 regulator drivers are for sub-devices of a MFD
driver for some PMIC blocks. But the same object file name (max77686.o)
was used for both the common MFD driver and the max77686 regulator one.
This confuses kbuild if both drivers are built as module causing the MFD
driver to not be copied when installing the modules.
Also, max77{686,802} are a quite generic name for MFD subdevices drivers
so it is better to rename them to max77{686,802}-regulator like it's the
case for most regulator drivers.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/Makefile | 4 | ||||
| -rw-r--r-- | drivers/regulator/max77686-regulator.c (renamed from drivers/regulator/max77686.c) | 0 | ||||
| -rw-r--r-- | drivers/regulator/max77802-regulator.c (renamed from drivers/regulator/max77802.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 980b194..a8c07a07 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -54,9 +54,9 @@ obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o -obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o +obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o -obj-$(CONFIG_REGULATOR_MAX77802) += max77802.o +obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686-regulator.c index 17ccf36..17ccf36 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686-regulator.c diff --git a/drivers/regulator/max77802.c b/drivers/regulator/max77802-regulator.c index c07ee13..c07ee13 100644 --- a/drivers/regulator/max77802.c +++ b/drivers/regulator/max77802-regulator.c |
