summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMieczyslaw Nalewaj2025-04-15 18:03:04 +0000
committerChristian Marangi2025-04-30 14:26:46 +0000
commitef590451a3ad1bb0f2ff302a9cc257aeb8640910 (patch)
tree2db078d0604828b117d0a951869088833ae4e7e5
parentdfe93dddfdc97291a60f38c677bd2a38e72b0edc (diff)
downloadopenwrt-ef590451a3ad1bb0f2ff302a9cc257aeb8640910.tar.gz
generic: mtdsplit: include appropriate header for kernel 6.12
In kernel 6.12 asm/unaligned.h was moved to linux/unaligned.h[1] The patch points to the appropriate header depending on the kernel version. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=5f60d5f6bbc12e782fac78110b0ee62698f3b576 Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/16547 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-rw-r--r--target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_lzma.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_lzma.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_lzma.c
index c58f7ae4bf..6dcffd0420 100644
--- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_lzma.c
+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_lzma.c
@@ -14,8 +14,13 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/of.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,12,0)
#include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
#include "mtdsplit.h"