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 /keyboards/meira | |
parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/meira')
-rwxr-xr-x | keyboards/meira/TWIlib.c | 2 | ||||
-rwxr-xr-x | keyboards/meira/lighting.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/meira/TWIlib.c b/keyboards/meira/TWIlib.c index 4091429b4e..8f5658fcdb 100755 --- a/keyboards/meira/TWIlib.c +++ b/keyboards/meira/TWIlib.c @@ -8,7 +8,7 @@ #include <avr/io.h> #include <avr/interrupt.h> #include "TWIlib.h" -#include "util/delay.h" +#include <util/delay.h> #include "print.h" // Global transmit buffer diff --git a/keyboards/meira/lighting.c b/keyboards/meira/lighting.c index 37bb45aec8..a02487f69b 100755 --- a/keyboards/meira/lighting.c +++ b/keyboards/meira/lighting.c @@ -9,7 +9,7 @@ #include "TWIlib.h" #include "lighting.h" #include "debug.h" -#include "audio/audio.h" +#include "audio.h" const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP; |