From: Hauke Mehrtens Date: Wed, 13 Mar 2024 19:35:19 +0000 (+0100) Subject: kernel: kmod-can-slcan: Fix can-slcan.ko location X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=712cda13514f593f0d6b82ac7056442291fce14a;p=openwrt%2Fstaging%2Fstintel.git kernel: kmod-can-slcan: Fix can-slcan.ko location The slcan.ko file was moved in upstream Linux: https://git.kernel.org/linus/98b12064591d635db86da4957b547067dc6897cc This fixes the build with kernel >= 6.0. This module was never build with kernel 6.1 before. Signed-off-by: Hauke Mehrtens --- diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk index 4ff85d1c01..e6c5db7135 100644 --- a/package/kernel/linux/modules/can.mk +++ b/package/kernel/linux/modules/can.mk @@ -182,7 +182,9 @@ $(eval $(call KernelPackage,can-raw)) define KernelPackage/can-slcan TITLE:=Serial / USB serial CAN Adaptors (slcan) KCONFIG:=CONFIG_CAN_SLCAN - FILES:=$(LINUX_DIR)/drivers/net/can/slcan.ko + FILES:= \ + $(LINUX_DIR)/drivers/net/can/slcan.ko@lt6.0 \ + $(LINUX_DIR)/drivers/net/can/slcan/slcan.ko@ge6.0 AUTOLOAD:=$(call AutoProbe,slcan) $(call AddDepends/can) endef