diff options
author | 2016-04-03 11:14:08 +0200 | |
---|---|---|
committer | 2016-04-03 11:23:00 +0200 | |
commit | 47dd29513eeec7b7f639bef6df441a905ce8bacb (patch) | |
tree | 29170847273e786384bd3d7c7781e67dc4335bbb /tmk_core/common/matrix.h | |
parent | 8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff) | |
parent | 8d39263d2444f0273327902684c802b218efb7b6 (diff) | |
download | qmk_firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.gz |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
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 } |