From: Arnd Bergmann <arnd@kernel.org>
To: Vikash Garodia <quic_vgarodia@quicinc.com>,
Dikshita Agarwal <quic_dikshita@quicinc.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
"Bryan O'Donoghue" <bryan.odonoghue@linaro.org>,
Stefan Schmidt <stefan.schmidt@linaro.org>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
Shérab <Sebastien.Hinderer@ens-lyon.org>,
"Abhinav Kumar" <quic_abhinavk@quicinc.com>,
"Vedang Nagar" <quic_vnagar@quicinc.com>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] media: iris: rename module file
Date: Wed, 19 Feb 2025 09:01:53 +0100 [thread overview]
Message-ID: <20250219080200.3907925-1-arnd@kernel.org> (raw)
From: Arnd Bergmann <arnd@arndb.de>
Build-testing on x86 showed two modules with conflicting "iris.ko"
names after the addition of the qualcomm driver:
error: the following would cause module name conflict:
arch/x86/platform/iris/iris.ko
drivers/media/platform/qcom/iris/iris.ko
Since this a new module, nothing should rely on the name yet, so
rename this one to a more specific "qcom-iris.ko".
Fixes: 38506cb7e8d2 ("media: iris: add platform driver for iris video device")
Cc: Shérab <Sebastien.Hinderer@ens-lyon.org> # for x86 iris
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/media/platform/qcom/iris/Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/platform/qcom/iris/Makefile
index f6d22b88f6db..35390534534e 100644
--- a/drivers/media/platform/qcom/iris/Makefile
+++ b/drivers/media/platform/qcom/iris/Makefile
@@ -1,4 +1,5 @@
-iris-objs += iris_buffer.o \
+qcom-iris-objs += \
+ iris_buffer.o \
iris_core.o \
iris_ctrls.o \
iris_firmware.o \
@@ -24,7 +25,7 @@ iris-objs += iris_buffer.o \
iris_vpu_common.o \
ifeq ($(CONFIG_VIDEO_QCOM_VENUS),)
-iris-objs += iris_platform_sm8250.o
+qcom-iris-objs += iris_platform_sm8250.o
endif
-obj-$(CONFIG_VIDEO_QCOM_IRIS) += iris.o
+obj-$(CONFIG_VIDEO_QCOM_IRIS) += qcom-iris.o
--
2.39.5
reply other threads:[~2025-02-19 8:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250219080200.3907925-1-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=Sebastien.Hinderer@ens-lyon.org \
--cc=arnd@arndb.de \
--cc=bryan.odonoghue@linaro.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_dikshita@quicinc.com \
--cc=quic_vgarodia@quicinc.com \
--cc=quic_vnagar@quicinc.com \
--cc=stefan.schmidt@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox