From 21b9fba3bf8889a8fb960ebbe058b6dccd6ce4bb Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Mon, 25 Nov 2019 19:01:27 +1300
Subject: [PATCH] Some fixes for what looks like merge problems introduced by
 #9012.

---
 src/main/io/displayport_hott.c | 4 ++--
 src/main/io/displayport_msp.c  | 3 ---
 src/main/osd/osd.h             | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/io/displayport_hott.c b/src/main/io/displayport_hott.c
index c12d3a0668..2fe93e8279 100644
--- a/src/main/io/displayport_hott.c
+++ b/src/main/io/displayport_hott.c
@@ -56,7 +56,7 @@ static int hottWriteString(displayPort_t *displayPort, uint8_t col, uint8_t row,
     UNUSED(attr);
 
     while (*s) {
-        hottWriteChar(displayPort,  col++, row, 0, *(s++));
+        hottWriteChar(displayPort,  col++, row, DISPLAYPORT_ATTR_NONE, *(s++));
     }
     return 0;
 }
@@ -65,7 +65,7 @@ static int hottClearScreen(displayPort_t *displayPort)
 {
     for (int row = 0; row < displayPort->rows; row++) {
         for (int col= 0; col < displayPort->cols; col++) {
-            hottWriteChar(displayPort, col, row, 0, ' ');
+            hottWriteChar(displayPort, col, row, DISPLAYPORT_ATTR_NONE, ' ');
         }
     }
     return 0;
diff --git a/src/main/io/displayport_msp.c b/src/main/io/displayport_msp.c
index bdc4e6e5e0..356c5f9019 100644
--- a/src/main/io/displayport_msp.c
+++ b/src/main/io/displayport_msp.c
@@ -29,9 +29,6 @@
 
 #include "common/utils.h"
 
-#include "pg/pg.h"
-#include "pg/pg_ids.h"
-
 #include "drivers/display.h"
 
 #include "io/displayport_msp.h"
diff --git a/src/main/osd/osd.h b/src/main/osd/osd.h
index 39251347a1..218b798bed 100644
--- a/src/main/osd/osd.h
+++ b/src/main/osd/osd.h
@@ -22,8 +22,6 @@
 
 #include "common/time.h"
 
-#include "drivers/display.h"
-
 #include "pg/pg.h"
 
 #include "sensors/esc_sensor.h"