From 48fdd9b07210133537b1d9606fc125fe621be3e7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 2 Mar 2026 16:21:01 -1000
Subject: [PATCH] merge merge error

---
 esphome/core/application.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/esphome/core/application.h b/esphome/core/application.h
index 5e591666ab..1889948fd1 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -659,12 +659,6 @@ class Application {
 #endif
 #endif  // USE_LWIP_FAST_SELECT
 
-#if defined(USE_ESP8266) && defined(USE_SOCKET_IMPL_LWIP_TCP)
-  /// Wake the main event loop from any context (ISR, thread, or main loop).
-  /// On ESP8266: sets the socket wake flag and calls esp_schedule() to exit esp_delay() early.
-  static void IRAM_ATTR wake_loop_any_context() { socket::socket_wake(); }
-#endif
-
 #if defined(USE_ESP8266) && defined(USE_SOCKET_IMPL_LWIP_TCP)
   /// Wake the main event loop from any context (ISR, thread, or main loop).
   /// On ESP8266: sets the socket wake flag and calls esp_schedule() to exit esp_delay() early.