From 535b52556696a91aa08b5fe0941909750da37fc2 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Fri, 16 Apr 2021 21:40:32 +0800 Subject: [PATCH] kernel: Adapt renamed can-dev.ko (#6695) The can-dev.ko kernel module was moved in kernel 5.4.110 and 5.10.28. Fixes: 5dcbd82 ("kernel: bump 5.4 to 5.4.110") Signed-off-by: Hauke Mehrtens [Also compatible with kernel 4.x] Signed-off-by: AmadeusGhost Co-authored-by: Hauke Mehrtens --- package/kernel/linux/modules/can.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk index 3bf0359c1..08ea7b5a3 100644 --- a/package/kernel/linux/modules/can.mk +++ b/package/kernel/linux/modules/can.mk @@ -28,7 +28,8 @@ define KernelPackage/can CONFIG_CAN_SOFTING=n \ CONFIG_NET_EMATCH_CANID=n \ CONFIG_CAN_DEBUG_DEVICES=n - FILES:=$(LINUX_DIR)/drivers/net/can/can-dev.ko \ + FILES:=$(LINUX_DIR)/drivers/net/can/can-dev.ko@lt5.4 \ + $(LINUX_DIR)/drivers/net/can/dev/can-dev.ko@ge5.4 \ $(LINUX_DIR)/net/can/can.ko AUTOLOAD:=$(call AutoProbe,can can-dev) endef