From cae7453f04e0c2a8f7c7999ea373712ab5a12d72 Mon Sep 17 00:00:00 2001
From: 1Conan <me@1conan.com>
Date: Sun, 29 Jan 2023 22:58:09 +0800
Subject: [PATCH] fix some rebase stuff

---
 tmk_core/protocol/chibios/chibios.c  |  8 --------
 tmk_core/protocol/chibios/usb_main.c | 14 --------------
 2 files changed, 22 deletions(-)

diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 8992fd3ab260..a249af8d38cc 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -34,10 +34,6 @@
 #include "debug.h"
 #include "print.h"
 
-#ifdef BLUETOOTH_ITON_BT
-#    include "iton_bt.h"
-#endif
-
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 // Change this to be TRUE once we've migrated keyboards to the new init system
 // Remember to change docs/platformdev_chibios_earlyinit.md as well.
@@ -146,10 +142,6 @@ void protocol_pre_init(void) {
     usb_event_queue_init();
     init_usb_driver(&USB_DRIVER);
 
-#ifdef BLUETOOTH_ITON_BT
-    iton_bt_init();
-#endif
-
 #ifdef MIDI_ENABLE
     setup_midi();
 #endif
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 343497eca534..4027fb438d35 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -38,13 +38,6 @@
 extern keymap_config_t keymap_config;
 #endif
 
-#ifdef BLUETOOTH_ENABLE
-#    include "outputselect.h"
-#    ifdef BLUETOOTH_ITON_BT
-#        include "iton_bt.h"
-#    endif
-#endif
-
 /* ---------------------------------------------------------
  *       Global interface variables and declarations
  * ---------------------------------------------------------
@@ -405,13 +398,6 @@ __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
 
 /* LED status */
 uint8_t keyboard_leds(void) {
-#ifdef BLUETOOTH_ENABLE
-    if (where_to_send() == OUTPUT_BLUETOOTH) {
-#    ifdef BLUETOOTH_ITON_BT
-        return iton_bt_led_state;
-#    endif
-    }
-#endif
     return keyboard_led_state;
 }