summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/keymaps/colemak/keymap.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-03-30 00:45:48 -0400
committerJack Humbert <jack.humb@gmail.com>2016-03-30 00:45:48 -0400
commite7377dc24b4aaf97f9c48ef7db78b7b6cbabe748 (patch)
tree7774668076bb8c8d2331028bb540510c078e60be /keyboard/ergodox_ez/keymaps/colemak/keymap.c
parentb8ac5095708b5023f5e3e375b22534f8b395741f (diff)
parent4a676746a6d8c9b47956f863ead335e995677c53 (diff)
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/colemak/keymap.c')
-rw-r--r--keyboard/ergodox_ez/keymaps/colemak/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/keymaps/colemak/keymap.c b/keyboard/ergodox_ez/keymaps/colemak/keymap.c
index ee72c42635..9601726f7b 100644
--- a/keyboard/ergodox_ez/keymaps/colemak/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/colemak/keymap.c
@@ -155,12 +155,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);