diff options
author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-29 20:03:22 -0400 |
---|---|---|
committer | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-03-29 20:03:22 -0400 |
commit | e28334017c94c6928dd7e82436cec171f0243747 (patch) | |
tree | d2b2ecb96aff656094b2113f83632e3131000a75 /tmk_core/common/matrix.h | |
parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
parent | 26513b497b8bae5160389c0beac2d45cbb29c50f (diff) |
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Diffstat (limited to 'tmk_core/common/matrix.h')
-rw-r--r-- | tmk_core/common/matrix.h | 4 |
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 } |