aboutsummaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez/keymaps/naps62/keymap.c
diff options
context:
space:
mode:
authorGravatar Christopher Browne <cbbrowne@ca.afilias.info>2016-06-13 16:06:03 -0400
committerGravatar Christopher Browne <cbbrowne@ca.afilias.info>2016-06-13 16:06:03 -0400
commitdc9bf78f2b1d7d894576d87ea9bfc86d7bb3deee (patch)
tree44f432118882f9176ef6d901dc3d389d28737254 /keyboard/ergodox_ez/keymaps/naps62/keymap.c
parentd649ab34334ff568448c47a04fcf40f1aa960135 (diff)
parent25d4772754186b8ab6ef86c28049da67a460f123 (diff)
downloadqmk_firmware-dc9bf78f2b1d7d894576d87ea9bfc86d7bb3deee.tar.gz
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/naps62/keymap.c')
-rw-r--r--keyboard/ergodox_ez/keymaps/naps62/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/naps62/keymap.c b/keyboard/ergodox_ez/keymaps/naps62/keymap.c
index b954a311e..d8c28423c 100644
--- a/keyboard/ergodox_ez/keymaps/naps62/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/naps62/keymap.c
@@ -158,12 +158,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);