diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2021-11-16 14:04:38 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2021-11-16 14:05:54 +0100 |
| commit | 2de2fe0510d525c9d7197e8618b88bf2e7a00223 (patch) | |
| tree | d10a3caf79b7f054f02194e1ee80c94aa6cae07b | |
| parent | 5e1ad1e63a85287656bb8bd41c85e1979bc2c03c (diff) | |
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 <max.krummenacher@toradex.com>
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-mainline_5.4.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |