From 2de2fe0510d525c9d7197e8618b88bf2e7a00223 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 16 Nov 2021 14:04:38 +0100 Subject: linux-toradex-mainline: fix conflict resolution Fix conflict resolution from forward porting commit 91fc2ff ("linux-toradex-mainline: bump version to patch-level 154") Signed-off-by: Max Krummenacher --- recipes-kernel/linux/linux-toradex-mainline_5.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-toradex-mainline_5.4.bb b/recipes-kernel/linux/linux-toradex-mainline_5.4.bb index eb0ee49..9a54626 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_5.4.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_5.4.bb @@ -15,7 +15,7 @@ require recipes-kernel/linux/linux-toradex-mainline.inc # Don't delete /older/ in the link as /older/ also contains the newest file and we have a stable # link -SRC_URIL:append:preempt-rt = " \ +SRC_URI:append:preempt-rt = " \ ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/patch-5.4.154-rt65.patch.xz;name=rt-patch \ file://preempt-rt.scc \ file://preempt-rt-less-latency.scc \ -- cgit v1.2.3