diff options
| author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-28 18:37:39 -0400 |
|---|---|---|
| committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-28 18:37:39 -0400 |
| commit | 535daad3cd812df58f4630df202a447836ac3084 (patch) | |
| tree | 4591f47555acb1d88f08caa7ab3bbb40fd828637 /keyboard/ergodox_ez/keymaps/software_neo2/keymap.c | |
| parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
| parent | 4a43c5684476611370820bd9592712754c211c52 (diff) | |
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/software_neo2/keymap.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/software_neo2/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c index 684ecf5e33..a734062f1c 100644 --- a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c +++ b/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c @@ -114,12 +114,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) }; // Runs just one time when the keyboard initializes. -void * matrix_init_user(void) { +void matrix_init_user(void) { }; // Runs constantly in the background, in a loop. -void * matrix_scan_user(void) { +void matrix_scan_user(void) { uint8_t layer = biton32(layer_state); |