summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2019-06-12 04:15:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-31 07:24:27 +0200
commit15718c84f313fe4d936874844cca2b49b535bdf7 (patch)
treed8b597c3f52e53275d5392c22a6eb628c342ac21 /drivers/media
parent56555c8f32b40393cd64610b79fc0228272a482b (diff)
downloadlinux-stable-15718c84f313fe4d936874844cca2b49b535bdf7.tar.gz
linux-stable-15718c84f313fe4d936874844cca2b49b535bdf7.tar.bz2
linux-stable-15718c84f313fe4d936874844cca2b49b535bdf7.zip
media: drivers: media: coda: fix warning same module names
commit 1296987d2baf7f56748359b8dd42c425b9e7ee3a upstream. When building with CONFIG_VIDEO_CODA and CONFIG_CODA_FS enabled as loadable modules, we see the following warning: fs/coda/coda.ko drivers/media/platform/coda/coda.ko Rework so media/platform/coda is named coda-vpu. Leaving CODA_FS as is since that's a well known module. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/coda/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/coda/Makefile
index f13adacd924e..cfe3ef8fad8a 100644
--- a/drivers/media/platform/coda/Makefile
+++ b/drivers/media/platform/coda/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(src)
-coda-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-jpeg.o
+coda-vpu-objs := coda-common.o coda-bit.o coda-gdi.o coda-h264.o coda-jpeg.o
-obj-$(CONFIG_VIDEO_CODA) += coda.o
+obj-$(CONFIG_VIDEO_CODA) += coda-vpu.o
obj-$(CONFIG_VIDEO_IMX_VDOA) += imx-vdoa.o