Skip to content

Commit c3eb47b

Browse files
6by9romandariana
authored andcommitted
firmware: rp1: Rename to rp1-fw to avoid module name collision
There is already the driver in drivers/mfd/rp1.ko, so having drivers/firmware/rp1.ko can cause issues when using modinfo and similar, and we can get errors with "Module rp1 is already loaded" when trying to load it. Rename the module so that the name is unique. Signed-off-by: Dave Stevenson <[email protected]> (cherry picked from commit 564a5ad)
1 parent 23f7f38 commit c3eb47b

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

drivers/firmware/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
1717
obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
1818
obj-$(CONFIG_MTK_ADSP_IPC) += mtk-adsp-ipc.o
1919
obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
20-
obj-$(CONFIG_FIRMWARE_RP1) += rp1.o
20+
obj-$(CONFIG_FIRMWARE_RP1) += rp1-fw.o
2121
obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o
2222
obj-$(CONFIG_QCOM_SCM) += qcom-scm.o
2323
qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o

0 commit comments

Comments
 (0)