aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core/protocol/lufa/lufa.h
diff options
context:
space:
mode:
authorHugh Enxing <henxing@draper.com>2017-03-28 12:11:49 -0400
committerHugh Enxing <henxing@draper.com>2017-03-28 12:11:49 -0400
commit3fdc45b4e9581c823ac09545241241e0c6d3f313 (patch)
treef17c050672086233a2de4e4c8d0ba72c5bd87841 /tmk_core/protocol/lufa/lufa.h
parent25f2295ba88627521bed63ec4e5412b983626901 (diff)
parent5e4daf1c6db980fad269fe7b013205008bfe701e (diff)
downloadfirmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.tar.gz
firmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.tar.bz2
firmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.zip
Merge branch 'master' into default_atreus_layout
Diffstat (limited to 'tmk_core/protocol/lufa/lufa.h')
-rw-r--r--tmk_core/protocol/lufa/lufa.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa/lufa.h b/tmk_core/protocol/lufa/lufa.h
index a049fd43c..a51573786 100644
--- a/tmk_core/protocol/lufa/lufa.h
+++ b/tmk_core/protocol/lufa/lufa.h
@@ -49,7 +49,7 @@
#include <LUFA/Drivers/USB/USB.h>
#include "host.h"
#ifdef MIDI_ENABLE
- #include "midi.h"
+ #include "process_midi.h"
#endif
#ifdef __cplusplus
extern "C" {