Merge branch 'esp32p4' into develop

tobozo · Jul 26, 2024 · eeb9fd8 · eeb9fd8
2 parents 9729d62 + aaa94e2
commit eeb9fd8
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/lgfx/v1/platforms/esp32/common.cpp b/src/lgfx/v1/platforms/esp32/common.cpp
@@ -35,15 +35,14 @@ Original Source:
 #include <soc/soc.h>
 #include <soc/i2c_reg.h>
 #include <soc/i2c_struct.h>
-//#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0))
  #if __has_include(<soc/syscon_reg.h>)
   #include <soc/syscon_reg.h>
  #endif
-//#else
+
  #if __has_include (<soc/apb_ctrl_reg.h>)
   #include <soc/apb_ctrl_reg.h>
  #endif
-//#endif
+
 #include <soc/efuse_reg.h>
 
 #include <esp_log.h>