summaryrefslogtreecommitdiff
path: root/tmk_core/common/bootmagic.c
diff options
context:
space:
mode:
authorJoshua T <joshua@sonofone.net>2016-10-15 15:14:10 -0500
committerJoshua T <joshua@sonofone.net>2016-10-15 15:14:10 -0500
commit2e6a1a53d73607030c470b88d3ed7223db5e0004 (patch)
treefd8ff310f0dba21f9135cdead49482af2276329b /tmk_core/common/bootmagic.c
parent5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (diff)
parent0a9ad8f335f5b5b9d184d9e5e9ece6cda149df7e (diff)
Merge remote-tracking branch 'upstream/master'
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 6730a2a4aa..2c6bcbae56 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); }