diff options
author | Anders Roxell <anders.roxell@linaro.org> | 2019-06-12 11:11:58 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-17 22:35:39 +0300 |
commit | be55e56eaaa83b7fd39dbdda31abc19e00e9a1f3 (patch) | |
tree | 7be4b033ae2dd83bf613d625e138e3392af52b73 | |
parent | de986efd26696f171946ee6a5720b3fa0aa43fc5 (diff) | |
download | linux-be55e56eaaa83b7fd39dbdda31abc19e00e9a1f3.tar.xz |
regulator: 88pm800: fix warning same module names
[ Upstream commit 6f10419187d0d5fe395e2a2f2a64370961bf02a3 ]
When building with CONFIG_MFD_88PM800 and CONFIG_REGULATOR_88PM800
enabled as loadable modules, we see the following warning:
warning: same module names found:
drivers/regulator/88pm800.ko
drivers/mfd/88pm800.ko
Rework so that the file is named 88pm800-regulator.
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | drivers/regulator/88pm800-regulator.c (renamed from drivers/regulator/88pm800.c) | 0 | ||||
-rw-r--r-- | drivers/regulator/Makefile | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800-regulator.c index 89bbd6e8bad1..89bbd6e8bad1 100644 --- a/drivers/regulator/88pm800.c +++ b/drivers/regulator/88pm800-regulator.c diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 801d9a34a203..bba9c4851faf 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o obj-$(CONFIG_REGULATOR_88PG86X) += 88pg86x.o -obj-$(CONFIG_REGULATOR_88PM800) += 88pm800.o +obj-$(CONFIG_REGULATOR_88PM800) += 88pm800-regulator.o obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o obj-$(CONFIG_REGULATOR_CPCAP) += cpcap-regulator.o obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o |