From 6c947443bf60ca789834d8251cb1fec6517a7431 Mon Sep 17 00:00:00 2001
From: philmoz <phil.a.mitchell@gmail.com>
Date: Mon, 20 Jan 2025 15:19:58 +1100
Subject: [PATCH] Fix rebase.

---
 radio/src/fonts/lvgl/lz4_font.cpp | 1 +
 radio/src/gui/colorlcd/lv_conf.h  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/radio/src/fonts/lvgl/lz4_font.cpp b/radio/src/fonts/lvgl/lz4_font.cpp
index 725da58fe45..bdbbf556334 100644
--- a/radio/src/fonts/lvgl/lz4_font.cpp
+++ b/radio/src/fonts/lvgl/lz4_font.cpp
@@ -49,6 +49,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#define __IRAM
 #define LV_SKIP_DEFINES 1
 #include "../../gui/colorlcd/lv_conf.h"
 #define LV_CONF_SKIP 1
diff --git a/radio/src/gui/colorlcd/lv_conf.h b/radio/src/gui/colorlcd/lv_conf.h
index cb7d763604f..bac27b7ba4d 100644
--- a/radio/src/gui/colorlcd/lv_conf.h
+++ b/radio/src/gui/colorlcd/lv_conf.h
@@ -24,8 +24,8 @@
 /* clang-format off */
 
 #include <stdint.h>
-#include "definitions.h"
 #if !defined(LV_SKIP_DEFINES)
+#include "definitions.h"
 #include "hal.h"
 #endif