diff options
author | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
commit | 2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch) | |
tree | 2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /drivers | |
parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/chibios/serial_usart.c | 2 | ||||
-rw-r--r-- | drivers/qwiic/micro_oled.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/chibios/serial_usart.c b/drivers/chibios/serial_usart.c index 8274717613..7c81b16464 100644 --- a/drivers/chibios/serial_usart.c +++ b/drivers/chibios/serial_usart.c @@ -1,6 +1,6 @@ #include "quantum.h" #include "serial.h" -#include "printf.h" +#include "print.h" #include <ch.h> #include <hal.h> diff --git a/drivers/qwiic/micro_oled.c b/drivers/qwiic/micro_oled.c index f63cf2e643..c7a4ee081d 100644 --- a/drivers/qwiic/micro_oled.c +++ b/drivers/qwiic/micro_oled.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include "util/font5x7.h" #include "util/font8x16.h" -#include "string.h" +#include <string.h> #define TOTALFONTS 2 const unsigned char* fonts_pointer[] = {font5x7, font8x16}; |