summaryrefslogtreecommitdiff
path: root/tmk_core/common/magic.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/magic.c
parent5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (diff)
parent0a9ad8f335f5b5b9d184d9e5e9ece6cda149df7e (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/magic.c')
-rw-r--r--tmk_core/common/magic.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/tmk_core/common/magic.c b/tmk_core/common/magic.c
index 194e4cc026..49617a3d10 100644
--- a/tmk_core/common/magic.c
+++ b/tmk_core/common/magic.c
@@ -27,10 +27,6 @@ void magic(void)
/* keymap config */
keymap_config.raw = eeconfig_read_keymap();
-#ifdef NKRO_ENABLE
- keyboard_nkro = keymap_config.nkro;
-#endif
-
uint8_t default_layer = 0;
default_layer = eeconfig_read_default_layer();
default_layer_set((uint32_t)default_layer);