github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: iris: rename module file

Browse Source 
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: 38506cb7e8 ("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>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Arnd Bergmann 2025-02-19 09:01:53 +01:00 committed by Hans Verkuil
parent 07df4f23ef
commit a21766b518
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/qcom/iris/Makefile
View File

@ -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