From a9a78a70cc0d4888bbf401533c980c152e0adcec Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 4 Nov 2017 12:19:14 +0100 Subject: [PATCH] ltq-adsl-mei: use the same file name for all variant Due to limitations in the symvers treatment and the mei drivers exporting the same funtions, modpost might use the wrong mei driver to link against. Work around this by renaming them all to the same name, making it always the "right" module name even if the wrong file was used. Signed-off-by: Jonas Gorski --- package/kernel/lantiq/ltq-adsl-mei/Makefile | 4 ++-- package/kernel/lantiq/ltq-adsl-mei/src/Makefile | 8 ++------ .../ltq-adsl-mei/src/{lantiq_mei.c => drv_mei_cpe.c} | 0 3 files changed, 4 insertions(+), 8 deletions(-) rename package/kernel/lantiq/ltq-adsl-mei/src/{lantiq_mei.c => drv_mei_cpe.c} (100%) diff --git a/package/kernel/lantiq/ltq-adsl-mei/Makefile b/package/kernel/lantiq/ltq-adsl-mei/Makefile index 91c798418d7..08e5775771d 100644 --- a/package/kernel/lantiq/ltq-adsl-mei/Makefile +++ b/package/kernel/lantiq/ltq-adsl-mei/Makefile @@ -23,8 +23,8 @@ define KernelPackage/ltq-adsl-mei-template URL:=http://www.lantiq.com/ VARIANT:=$(1) DEPENDS:=@$(2) - FILES:=$(PKG_BUILD_DIR)/ltq_mei_$(1).ko - AUTOLOAD:=$(call AutoLoad,50,ltq_mei_$(1)) + FILES:=$(PKG_BUILD_DIR)/drv_mei_cpe.ko + AUTOLOAD:=$(call AutoLoad,50,drv_mei_cpe) endef KernelPackage/ltq-adsl-danube-mei=$(call KernelPackage/ltq-adsl-mei-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy)) diff --git a/package/kernel/lantiq/ltq-adsl-mei/src/Makefile b/package/kernel/lantiq/ltq-adsl-mei/src/Makefile index 2d8645f8f27..9a3b89195c6 100644 --- a/package/kernel/lantiq/ltq-adsl-mei/src/Makefile +++ b/package/kernel/lantiq/ltq-adsl-mei/src/Makefile @@ -1,17 +1,13 @@ ifeq ($(BUILD_VARIANT),danube) CFLAGS_MODULE = -DCONFIG_DANUBE -DCONFIG_IFXMIPS_DSL_CPE_MEI - obj-m = ltq_mei_danube.o - ltq_mei_danube-objs = lantiq_mei.o endif ifeq ($(BUILD_VARIANT),ase) CFLAGS_MODULE = -DCONFIG_AMAZON_SE -DCONFIG_IFXMIPS_DSL_CPE_MEI - obj-m = ltq_mei_ase.o - ltq_mei_ase-objs = lantiq_mei.o endif ifeq ($(BUILD_VARIANT),ar9) CFLAGS_MODULE = -DCONFIG_AR9 -DCONFIG_IFXMIPS_DSL_CPE_MEI - obj-m = ltq_mei_ar9.o - ltq_mei_ar9-objs = lantiq_mei.o endif + +obj-m = drv_mei_cpe.o diff --git a/package/kernel/lantiq/ltq-adsl-mei/src/lantiq_mei.c b/package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c similarity index 100% rename from package/kernel/lantiq/ltq-adsl-mei/src/lantiq_mei.c rename to package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c