summaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-27 17:37:04 +0000
committerQMK Bot <hello@qmk.fm>2020-12-27 17:37:04 +0000
commit99d6349978b2117ed7ca3e0e3d2d84616df323d6 (patch)
treec75879012cba1026d3cee3ae7a793d0c525d6cc8 /tmk_core/protocol
parent0c5be869ffb7de6ca1107a5804d6d4d536d80e91 (diff)
parent1b7b72c0e96856d2b9f73f705787af3426662bcf (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/chibios.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/tmk_core/protocol/chibios.mk b/tmk_core/protocol/chibios.mk
index 2070420f56..80554abb32 100644
--- a/tmk_core/protocol/chibios.mk
+++ b/tmk_core/protocol/chibios.mk
@@ -18,4 +18,3 @@ OPT_DEFS += -DFIXED_NUM_CONFIGURATIONS=1
ifeq ($(strip $(MIDI_ENABLE)), yes)
include $(TMK_PATH)/protocol/midi.mk
endif
-