From 7b0bc3de7d5f084a23cd46809f91ddac68b36c55 Mon Sep 17 00:00:00 2001 From: blckmn Date: Sat, 7 Jun 2025 09:52:47 +1000 Subject: [PATCH] PICO: Resolved merge conflict --- src/main/msp/msp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c index 87136e8f9a..3087069b9d 100644 --- a/src/main/msp/msp.c +++ b/src/main/msp/msp.c @@ -255,6 +255,7 @@ static void mspEscPassthroughFn(serialPort_t *serialPort) } #endif +#ifdef USE_SERIAL_PASSTHROUGH static serialPort_t *mspFindPassthroughSerialPort(void) { serialPortUsage_t *portUsage = NULL;