aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core/common/matrix.h
diff options
context:
space:
mode:
authorAlex Johnstone <alexjj@gmail.com>2016-03-25 11:16:33 -0700
committerAlex Johnstone <alexjj@gmail.com>2016-03-25 11:16:33 -0700
commit2d9037491271677f6642ec162b6a8be3ebb47e78 (patch)
treed3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /tmk_core/common/matrix.h
parentfb6dc7499f51688ec245826842300780273203c6 (diff)
parentc9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff)
downloadfirmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.gz
firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.tar.bz2
firmware-2d9037491271677f6642ec162b6a8be3ebb47e78.zip
Merge pull request #3 from jackhumbert/master
Pull upstream
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 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
}