Skip to content

Commit 47820d3

Browse files
abelvesaandersson
authored andcommitted
soc: qcom: Rename ice to qcom_ice to avoid module name conflict
The following error was reported when building x86_64 allmodconfig: error: the following would cause module name conflict: drivers/soc/qcom/ice.ko drivers/net/ethernet/intel/ice/ice.ko Seems the 'ice' module name is already used by some Intel ethernet driver, so lets rename the Qualcomm Inline Crypto Engine (ICE) module from 'ice' to 'qcom_ice' to avoid any kind of errors/confusions. Reported-by: Stephen Rothwell <[email protected]> Fixes: 2afbf43 ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver") Acked-by: Mukesh Ojha <[email protected]> Signed-off-by: Abel Vesa <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7b374a2 commit 47820d3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/soc/qcom/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
3232
obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o
3333
obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) += kryo-l2-accessors.o
3434
obj-$(CONFIG_QCOM_ICC_BWMON) += icc-bwmon.o
35-
obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += ice.o
35+
qcom_ice-objs += ice.o
36+
obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += qcom_ice.o

0 commit comments

Comments
 (0)