summaryrefslogtreecommitdiff
path: root/keyboard/jd45
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 /keyboard/jd45
parentccf848917b7e931327f6c4a469877e9d8ef238ea (diff)
parent26513b497b8bae5160389c0beac2d45cbb29c50f (diff)
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Diffstat (limited to 'keyboard/jd45')
-rw-r--r--keyboard/jd45/jd45.c8
-rw-r--r--keyboard/jd45/jd45.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/keyboard/jd45/jd45.c b/keyboard/jd45/jd45.c
index d05714f07b..bc3fcd3ddf 100644
--- a/keyboard/jd45/jd45.c
+++ b/keyboard/jd45/jd45.c
@@ -1,16 +1,16 @@
#include "jd45.h"
__attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
};
__attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
};
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
backlight_init_ports();
#endif
@@ -20,7 +20,7 @@ void * matrix_init_kb(void) {
}
};
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
if (matrix_scan_user) {
(*matrix_scan_user)();
}
diff --git a/keyboard/jd45/jd45.h b/keyboard/jd45/jd45.h
index f07bd5e139..d0ca1a88d0 100644
--- a/keyboard/jd45/jd45.h
+++ b/keyboard/jd45/jd45.h
@@ -6,7 +6,7 @@
#include "backlight.h"
#include <stddef.h>
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
#endif