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 /tmk_core/common/matrix.h | |
parent | ccf848917b7e931327f6c4a469877e9d8ef238ea (diff) | |
parent | 4a43c5684476611370820bd9592712754c211c52 (diff) | |
download | qmk_firmware-535daad3cd812df58f4630df202a447836ac3084.tar.gz |
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
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 85415df71..0b013fc98 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 } |