summaryrefslogtreecommitdiff
path: root/tmk_core/common/matrix.h
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 /tmk_core/common/matrix.h
parentb8ac5095708b5023f5e3e375b22534f8b395741f (diff)
parent4a676746a6d8c9b47956f863ead335e995677c53 (diff)
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
Diffstat (limited to 'tmk_core/common/matrix.h')
-rw-r--r--tmk_core/common/matrix.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index 85415df719..0b013fc989 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -64,8 +64,8 @@ void matrix_power_up(void);
void matrix_power_down(void);
/* keyboard-specific setup/loop functionality */
-void * matrix_init_kb(void);
-void * matrix_scan_kb(void);
+void matrix_init_kb(void);
+void matrix_scan_kb(void);
#ifdef __cplusplus
}