Commit 47820d32 authored by Abel Vesa's avatar Abel Vesa Committed by Bjorn Andersson
Browse files

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: 2afbf43a ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver")
Acked-by: default avatarMukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: default avatarAbel Vesa <abel.vesa@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230516082856.150214-1-abel.vesa@linaro.org
parent 7b374a2f
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -32,4 +32,5 @@ obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o
obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) +=	kryo-l2-accessors.o
obj-$(CONFIG_QCOM_ICC_BWMON)	+= icc-bwmon.o
obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE)	+= ice.o
qcom_ice-objs			+= ice.o
obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE)	+= qcom_ice.o