summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/matrix.h
diff options
context:
space:
mode:
authorNoah Andrews <NoahAndrews@users.noreply.github.com>2016-03-29 20:03:22 -0400
committerNoah Andrews <NoahAndrews@users.noreply.github.com>2016-03-29 20:03:22 -0400
commite28334017c94c6928dd7e82436cec171f0243747 (patch)
treed2b2ecb96aff656094b2113f83632e3131000a75 /tmk_core/common/matrix.h
parentccf848917b7e931327f6c4a469877e9d8ef238ea (diff)
parent26513b497b8bae5160389c0beac2d45cbb29c50f (diff)
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
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 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
}
[cgit] Unable to lock slot /tmp/cgit/92200000.lock: Permission denied (13)