summaryrefslogtreecommitdiff
path: root/tmk_core/common/bootmagic.c
diff options
context:
space:
mode:
authorStephen Christie2016-09-19 18:05:58 -0400
committerStephen Christie2016-09-19 18:05:58 -0400
commit57a6828a7a73d7b7c3dd9693e04d6873e2e3d1c2 (patch)
treebdabbdbdd9fd6de500728721d1865058468871e3 /tmk_core/common/bootmagic.c
parentbf2b260429dbc015d49d005065a37441c8f15753 (diff)
parent5f9c2f63ffb2c58db73e67442134be58bfe2c129 (diff)
Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/bootmagic.c')
-rw-r--r--tmk_core/common/bootmagic.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/tmk_core/common/bootmagic.c b/tmk_core/common/bootmagic.c
index 6730a2a4a..2c6bcbae5 100644
--- a/tmk_core/common/bootmagic.c
+++ b/tmk_core/common/bootmagic.c
@@ -83,10 +83,6 @@ void bootmagic(void)
}
eeconfig_update_keymap(keymap_config.raw);
-#ifdef NKRO_ENABLE
- keyboard_nkro = keymap_config.nkro;
-#endif
-
/* default layer */
uint8_t default_layer = 0;
if (bootmagic_scan_keycode(BOOTMAGIC_KEY_DEFAULT_LAYER_0)) { default_layer |= (1<<0); }