diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-11 02:46:19 +0000 |
| commit | fdfcce57e1c46765e0aebf37ad3d9611a7384241 (patch) | |
| tree | 9524405fef6cc3b16965517735dc0ef315f67ab1 /quantum/keymap.h | |
| parent | ed76f4394fd95413f7da11e2342b0965182ccb95 (diff) | |
| parent | 501f2fdef115314713e94428d409e5c3b5bfc1c2 (diff) | |
| download | qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.tar.gz qmk_firmware-fdfcce57e1c46765e0aebf37ad3d9611a7384241.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum/keymap.h')
| -rw-r--r-- | quantum/keymap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index de3bece11..90a2398ba 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h | |||
| @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 25 | # include <avr/pgmspace.h> | 25 | # include <avr/pgmspace.h> |
| 26 | #elif defined PROTOCOL_CHIBIOS | 26 | #elif defined PROTOCOL_CHIBIOS |
| 27 | // We need to ensure that chibios is include before redefining reset | 27 | // We need to ensure that chibios is include before redefining reset |
| 28 | # include "ch.h" | 28 | # include <ch.h> |
| 29 | #endif | 29 | #endif |
| 30 | #include "keycode.h" | 30 | #include "keycode.h" |
| 31 | #include "action_macro.h" | 31 | #include "action_macro.h" |