diff options
| author | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
|---|---|---|
| committer | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
| commit | e51001efcc3ff8b64f8264e8bd4c2dbea15f3364 (patch) | |
| tree | bdf5a0a4b44d5e63ba1376b70d94f64c77f3c90c /tmk_core/common/bootmagic.c | |
| parent | c56693f858cb3409e4a68a8e65a1370c022a51ed (diff) | |
| parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) | |
| download | qmk_firmware-e51001efcc3ff8b64f8264e8bd4c2dbea15f3364.tar.gz qmk_firmware-e51001efcc3ff8b64f8264e8bd4c2dbea15f3364.zip | |
Merge remote-tracking branch 'qmk/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 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); } |