From: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Date: Tue, 15 Apr 2025 18:03:04 +0000 (+0200)
Subject: generic: mtdsplit: include appropriate header for kernel 6.12
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ef590451a3ad1bb0f2ff302a9cc257aeb8640910;p=openwrt%2Fstaging%2Fstintel.git

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>
---

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"