summaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-16 03:27:52 +0000
committerQMK Bot <hello@qmk.fm>2020-12-16 03:27:52 +0000
commit2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch)
tree2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /tmk_core/protocol
parent416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff)
parent9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h4
-rw-r--r--tmk_core/protocol/chibios/main.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h b/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
index f59c8d1dda..22f882cbb8 100644
--- a/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
+++ b/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
@@ -1,6 +1,6 @@
#include "progmem.h"
-#include "stddef.h"
-#include "inttypes.h"
+#include <stddef.h>
+#include <inttypes.h>
#define ATTR_PACKED __attribute__((packed))
/** Concatenates the given input into a single token, via the C Preprocessor.
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index b99a40f1e0..e07c181fc8 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -31,7 +31,7 @@
#include "led.h"
#include "sendchar.h"
#include "debug.h"
-#include "printf.h"
+#include "print.h"
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
// Change this to be TRUE once we've migrated keyboards to the new init system