From: Hauke Mehrtens Date: Sun, 26 May 2024 20:24:59 +0000 (+0200) Subject: kernel: kmod-can-usb-esd: Fix build on kernel 6.6 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ee1983a2ffc2deb4564fd2ebcbead8035dae9e25;p=openwrt%2Fstaging%2Fdangole.git kernel: kmod-can-usb-esd: Fix build on kernel 6.6 The kernel module and configuration option was renamed from esd_usb2.ko to esd_usb.ko in kernel 6.0. Adapt the kernel package. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5e910bdedc84c1f196863cebdf27c1806449c27c Signed-off-by: Hauke Mehrtens --- diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk index eda9b0c487..603976ef5f 100644 --- a/package/kernel/linux/modules/can.mk +++ b/package/kernel/linux/modules/can.mk @@ -235,9 +235,13 @@ $(eval $(call KernelPackage,can-usb-ems)) define KernelPackage/can-usb-esd TITLE:=ESD USB/2 CAN/USB interface - KCONFIG:=CONFIG_CAN_ESD_USB2 - FILES:=$(LINUX_DIR)/drivers/net/can/usb/esd_usb2.ko - AUTOLOAD:=$(call AutoProbe,esd_usb2) + KCONFIG:= \ + CONFIG_CAN_ESD_USB2@lt6.0 \ + CONFIG_CAN_ESD_USB@ge6.0 + FILES:= \ + $(LINUX_DIR)/drivers/net/can/usb/esd_usb2.ko@lt6.0 \ + $(LINUX_DIR)/drivers/net/can/usb/esd_usb.ko@ge6.0 + AUTOLOAD:=$(call AutoProbe,esd_usb2 esd_usb) $(call AddDepends/can,+kmod-usb-core) endef