| Message ID | 20230516082856.150214-1-abel.vesa@linaro.org |
|---|---|
| State | Accepted |
| Commit | 47820d3263a4a7ba258fe2efe26ae5afb5b83036 |
| Headers | show |
| Series | [v3] soc: qcom: Rename ice to qcom_ice to avoid module name conflict | expand |
On Tue, 16 May 2023 11:28:56 +0300, Abel Vesa wrote: > 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. > > [...] Applied, thanks! [1/1] soc: qcom: Rename ice to qcom_ice to avoid module name conflict commit: 47820d3263a4a7ba258fe2efe26ae5afb5b83036 Best regards,
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 0f43a88b4894..89b775512bef 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -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
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 <sfr@canb.auug.org.au> Fixes: 2afbf43a4aec ("soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver") Acked-by: Mukesh Ojha <quic_mojha@quicinc.com> Signed-off-by: Abel Vesa <abel.vesa@linaro.org> --- Changes since v2: * kept the filename as 'ice.c' while renaming the modules to 'qcom_ice' drivers/soc/qcom/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)