From 4aa6c212d2e070918b184d68e07334a3c2e4488f Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Wed, 18 Aug 2021 21:42:17 +1000
Subject: [PATCH] AP_MSP: move from HAL_NO_GCS to HAL_GCS_ENABLED

---
 libraries/AP_MSP/AP_MSP_Telem_Backend.cpp | 2 +-
 libraries/AP_OSD/AP_OSD.h                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/AP_MSP/AP_MSP_Telem_Backend.cpp b/libraries/AP_MSP/AP_MSP_Telem_Backend.cpp
index a68d8429a8..70f3781575 100644
--- a/libraries/AP_MSP/AP_MSP_Telem_Backend.cpp
+++ b/libraries/AP_MSP/AP_MSP_Telem_Backend.cpp
@@ -316,7 +316,7 @@ void AP_MSP_Telem_Backend::update_flight_mode_str(char *flight_mode_str, uint8_t
                 MANU [S]
                 MANU [SS]
         */
-#ifndef HAL_NO_GCS
+#if HAL_GCS_ENABLED
         const char* simple_mode_str = gcs().simple_input_active() ? " [S]" : (gcs().supersimple_input_active() ? " [SS]" : "");
         snprintf(flight_mode_str, size, "%s%s", notify->get_flight_mode_str(), simple_mode_str);
 #else
diff --git a/libraries/AP_OSD/AP_OSD.h b/libraries/AP_OSD/AP_OSD.h
index b3dfadc9ac..d71e5665ff 100644
--- a/libraries/AP_OSD/AP_OSD.h
+++ b/libraries/AP_OSD/AP_OSD.h
@@ -24,7 +24,7 @@
 #include <AP_Param/AP_Param.h>
 #include <GCS_MAVLink/GCS.h>
 #include <AP_OLC/AP_OLC.h>
-
+#include <AP_MSP/msp.h>
 
 #ifndef OSD_ENABLED
 #define OSD_ENABLED !HAL_MINIMIZE_FEATURES