summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/matrix.h
diff options
context:
space:
mode:
authorStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-03-24 08:22:21 +0100
committerStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-03-24 08:22:21 +0100
commit8b883c797fc043def3abe5c367cb9d9a6f11f8fb (patch)
treefa0d91fd40de1db1ab744bce880a4cbe2bbc8b5e /tmk_core/common/matrix.h
parent55fa66428ca9b75106b8a296ea6095f7b80cc109 (diff)
parentba058f8b81132bf64b1aa263779629b8a6c18c23 (diff)
downloadqmk_firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.gz
qmk_firmware-8b883c797fc043def3abe5c367cb9d9a6f11f8fb.tar.xz
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
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
}