summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/keyboard.c
diff options
context:
space:
mode:
authorStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-03-29 07:49:54 +0200
committerStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-03-29 07:49:54 +0200
commitf7f4f1725e3d9551c8b7660475ef076bcb8ecbf2 (patch)
treed3143b31c85d0711324e0c6b6be41e12ac42653e /tmk_core/common/keyboard.c
parent37e68596ddefcaa9ac0289a8e17672804e475327 (diff)
parent8bbc1dcf4f52ecd675f23a9b7d4b4d812dd3ee79 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/keyboard.c')
-rw-r--r--tmk_core/common/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index e668084858..302b3ec87c 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -92,7 +92,7 @@ void keyboard_init(void)
backlight_init();
#endif
-#ifdef FORCE_NKRO
+#if defined(NKRO_ENABLE) && defined(FORCE_NKRO)
keyboard_nkro = true;
#endif