summaryrefslogtreecommitdiff
path: root/quantum/quantum.h
diff options
context:
space:
mode:
authorDavid Olsson2017-02-11 10:50:37 +0100
committerDavid Olsson2017-02-11 10:50:37 +0100
commit052f81aacaa3b5afa93f9db3667f31f9365348ce (patch)
treedcfde5c6fed00e248535ac4d975831f33316cc8a /quantum/quantum.h
parentaa69337cf563d7b37722aabfcd1c5bae6c185208 (diff)
parent835556da9111d91b71c545d6a273e843f07631ae (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r--quantum/quantum.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h
index e6adf974a..18f072189 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -15,7 +15,6 @@
#ifdef RGBLIGHT_ENABLE
#include "rgblight.h"
#endif
-
#include "action_layer.h"
#include "eeconfig.h"
#include <stddef.h>
@@ -63,6 +62,10 @@ extern uint32_t default_layer_state;
#include "process_printer.h"
#endif
+#ifdef COMBO_ENABLE
+ #include "process_combo.h"
+#endif
+
#define SEND_STRING(str) send_string(PSTR(str))
void send_string(const char *str);