diff --git a/device/testing/linux-samsung-chagallwifi/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch b/device/testing/linux-samsung-chagallwifi/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch
new file mode 100644
index 000000000..20e499ab1
--- /dev/null
+++ b/device/testing/linux-samsung-chagallwifi/03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch
@@ -0,0 +1,37 @@
+From 50088414b5eacfa0a2345f26448fd27dc28bc245 Mon Sep 17 00:00:00 2001
+From: Henrik Grimler <henrik@grimler.se>
+Date: Mon, 1 Jan 2024 09:04:29 +0100
+Subject: [PATCH] drivers: psmouse: add guard for Finger Sensing Pad code
+
+To fix errors like:
+armv7-alpine-linux-musleabihf-ld: drivers/built-in.o: in function `psmouse_extensions':
+psmouse-base.c:(.text+0x22f0c8): undefined reference to `fsp_detect'
+armv7-alpine-linux-musleabihf-ld: psmouse-base.c:(.text+0x22f398): undefined reference to `fsp_detect'
+---
+ drivers/input/mouse/psmouse-base.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
+index 22fe2547e169..d4ec99d8cc84 100644
+--- a/drivers/input/mouse/psmouse-base.c
++++ b/drivers/input/mouse/psmouse-base.c
+@@ -818,6 +818,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
+ 			return PSMOUSE_TOUCHKIT_PS2;
+ 	}
+ 
++#ifdef CONFIG_MOUSE_PS2_SENTELIC
+ /*
+  * Try Finger Sensing Pad. We do it here because its probe upsets
+  * Trackpoint devices (causing TP_READ_ID command to time out).
+@@ -833,7 +834,7 @@ static int psmouse_extensions(struct psmouse *psmouse,
+ 			max_proto = PSMOUSE_IMEX;
+ 		}
+ 	}
+-
++#endif
+ /*
+  * Reset to defaults in case the device got confused by extended
+  * protocol probes. Note that we follow up with full reset because
+-- 
+2.43.0
+
diff --git a/device/testing/linux-samsung-chagallwifi/APKBUILD b/device/testing/linux-samsung-chagallwifi/APKBUILD
index 89c0e200e..994aeb852 100644
--- a/device/testing/linux-samsung-chagallwifi/APKBUILD
+++ b/device/testing/linux-samsung-chagallwifi/APKBUILD
@@ -24,6 +24,7 @@ source="
 	$_config
 	01-netfilter-symbols.patch
 	02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
+	03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch
 	gcc7-give-up-on-ilog2-const-optimizations.patch
 	gcc8-fix-put-user.patch
 	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -51,6 +52,7 @@ c10c0b457a37ca89172203d83b0c5efd3b4fd4a9e4ff5b64328737275cfc4b19d4a316eab61aa556
 9f5a290e6675208ef616e2f0aea721dc14708e35fb12da1cb0e19dc21ccc05c53ba4698f916f8aad685931f629c2db2aae80cb31f38225984e863c26f49116dd  config-samsung-chagallwifi.armv7
 5214a850d496bed9e17575bd0b52e9e4415bcbd5a89863f924c5bfed848f684c0a95e8d10c9ef93c0e00149f034cf5e897d1b268be35676a600b3ee6e1917501  01-netfilter-symbols.patch
 5fad0940e90da71277b70b6e72fbb75fcc5e12625e65f827ae896d448628b252b3312539f9c184b26ffe5ca3b343a56b388ea6addb7fe446c7d1ae2aefb4b51e  02-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
+a3df24c8d9116a3ad3559aac5ce126049e9123df633990ec72facd64ef538ed773e3ac0da233f2e04d99164d590340d598cfb3da3bbea502cf7c2cd3ef08cf24  03-drivers-psmouse-add-guard-for-Finger-Sensing-Pad-cod.patch
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
diff --git a/device/testing/linux-samsung-klimtlte/APKBUILD b/device/testing/linux-samsung-klimtlte/APKBUILD
index e3a3817ac..b1704d0af 100644
--- a/device/testing/linux-samsung-klimtlte/APKBUILD
+++ b/device/testing/linux-samsung-klimtlte/APKBUILD
@@ -28,6 +28,7 @@ source="
 	gcc8-fix-put-user.patch
 	gcc10-extern_YYLOC_global_declaration.patch
 	kernel-use-the-gnu89-standard-explicitly.patch
+	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -57,4 +58,5 @@ a3df24c8d9116a3ad3559aac5ce126049e9123df633990ec72facd64ef538ed773e3ac0da233f2e0
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 7488e1b2714bb5771375684b4e27c0e773720da57f6d7b9a74225bfd2b21493f9e20ee219e7c6f8cfb57cda7b17f86fa2bc35a1b26471b1d7cee3f5b5ab6562a  kernel-use-the-gnu89-standard-explicitly.patch
+9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
 "
diff --git a/device/testing/linux-samsung-klimtlte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/testing/linux-samsung-klimtlte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
new file mode 120000
index 000000000..858243081
--- /dev/null
+++ b/device/testing/linux-samsung-klimtlte/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
\ No newline at end of file