diff mbox series

media: iris: rename module file

Message ID 20250219080200.3907925-1-arnd@kernel.org (mailing list archive)
State Not Applicable
Headers show
Series media: iris: rename module file | expand

Commit Message

Arnd Bergmann Feb. 19, 2025, 8:01 a.m. UTC 
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 mbox series

Patch

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