From 1cf45adb3ba9e702a380305a34b17257f7ae7e51 Mon Sep 17 00:00:00 2001
From: Andrew LaMarche <andrewjlamarche@gmail.com>
Date: Tue, 21 Apr 2026 18:19:01 +0000
Subject: [PATCH] octeon: refresh 6.18 patches

Refresh patches for 6.18.

Signed-off-by: Andrew LaMarche <andrewjlamarche@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23031
Signed-off-by: Nick Hainke <vincent@systemli.org>
---
 .../octeon/patches-6.18/000-fix-octeon-kernel-build.patch     | 4 ++--
 .../octeon/patches-6.18/100-mips_image_cmdline_hack.patch     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/linux/octeon/patches-6.18/000-fix-octeon-kernel-build.patch b/target/linux/octeon/patches-6.18/000-fix-octeon-kernel-build.patch
index 5381c1d9eb..adea180423 100644
--- a/target/linux/octeon/patches-6.18/000-fix-octeon-kernel-build.patch
+++ b/target/linux/octeon/patches-6.18/000-fix-octeon-kernel-build.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/cavium-octeon/octeon-platform.c
 +++ b/arch/mips/cavium-octeon/octeon-platform.c
-@@ -15,6 +15,7 @@
- #include <linux/libfdt.h>
+@@ -16,6 +16,7 @@
+ #include <linux/string.h>
  
  #include <asm/octeon/octeon.h>
 +#include <asm/octeon/octeon-platform.h>
diff --git a/target/linux/octeon/patches-6.18/100-mips_image_cmdline_hack.patch b/target/linux/octeon/patches-6.18/100-mips_image_cmdline_hack.patch
index a7a4ea0ada..b55da2f5f6 100644
--- a/target/linux/octeon/patches-6.18/100-mips_image_cmdline_hack.patch
+++ b/target/linux/octeon/patches-6.18/100-mips_image_cmdline_hack.patch
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1132,6 +1132,10 @@ config MIPS_MSC
+@@ -1178,6 +1178,10 @@ config MIPS_MSC
  config SYNC_R4K
  	bool
  
@@ -23,7 +23,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  
 --- a/arch/mips/kernel/head.S
 +++ b/arch/mips/kernel/head.S
-@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry)
+@@ -81,6 +81,12 @@ FEXPORT(__kernel_entry)
  	j	kernel_entry
  #endif /* CONFIG_BOOT_RAW */