summaryrefslogtreecommitdiffstats
path: root/keyboard/jd45/jd45.c
diff options
context:
space:
mode:
authorIBNobody <protospherex@gmail.com>2016-03-22 20:39:05 -0500
committerIBNobody <protospherex@gmail.com>2016-03-22 20:39:05 -0500
commitec62d9e85cab5cf166241b0536120d005fa7c898 (patch)
tree5b2a544070d80833bb7668ffc34dc3143b62a3d5 /keyboard/jd45/jd45.c
parent8a2457d7534ba082b52599e3af56f9e50e8dc38a (diff)
parent403d756ad56de18488e3d048e849c55e77a20b32 (diff)
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts: # quantum/template/template.c # quantum/template/template.h
Diffstat (limited to 'keyboard/jd45/jd45.c')
-rw-r--r--keyboard/jd45/jd45.c8
1 files changed, 4 insertions, 4 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)();
}