diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-05-04 08:03:25 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-05-04 08:03:25 +0200 |
| commit | 660511f05007b7299a8ceceba02d92ab33574ce1 (patch) | |
| tree | a36d0f69f87f0045f5a3c015ddd632cba3c0e37c /quantum/keymap_common.c | |
| parent | 507db3ab13b7d058e683a6729f81ee214c1a4f17 (diff) | |
| parent | 31a697bc054c97c5ef168c5fd4633bb247cc5d7b (diff) | |
| download | firmware-660511f05007b7299a8ceceba02d92ab33574ce1.tar.gz firmware-660511f05007b7299a8ceceba02d92ab33574ce1.tar.bz2 firmware-660511f05007b7299a8ceceba02d92ab33574ce1.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 4b4bd6210..5e78d1157 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -24,10 +24,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "action_macro.h" #include "debug.h" #include "backlight.h" -#include "keymap_midi.h" #include "bootloader.h" #include "eeconfig.h" +#ifdef MIDI_ENABLE + #include "keymap_midi.h" +#endif + + extern keymap_config_t keymap_config; #include <stdio.h> |