diff options
author | dbroqua <dbroqua@mousur.org> | 2016-09-19 13:26:18 +0200 |
---|---|---|
committer | dbroqua <dbroqua@mousur.org> | 2016-09-19 13:26:18 +0200 |
commit | 21b6e4c1f3225fed55926a4e6be2888d17fe5fd2 (patch) | |
tree | 63504b528703a65c4addda6658a701e405bba44c /tmk_core/common/bootmagic.c | |
parent | 94af0194ddfe8f8a3069c926170d8995de5c1781 (diff) | |
parent | c438a2a265b366c8e4594ce561feb896018983f0 (diff) | |
download | firmware-21b6e4c1f3225fed55926a4e6be2888d17fe5fd2.tar.gz firmware-21b6e4c1f3225fed55926a4e6be2888d17fe5fd2.tar.bz2 firmware-21b6e4c1f3225fed55926a4e6be2888d17fe5fd2.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tmk_core/common/bootmagic.c')
-rw-r--r-- | tmk_core/common/bootmagic.c | 4 |
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); } |