diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-22 17:29:31 -0400 |
| commit | a4ff9f256738cf637553e7840d53f778d791fb6f (patch) | |
| tree | 91d327587401e69843eecb353e97a3119aa9939b /tmk_core | |
| parent | e36a441274e9e494e1d8e38df1901f3acf9def27 (diff) | |
| parent | 403d756ad56de18488e3d048e849c55e77a20b32 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core')
| -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 } |