diff options
| author | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
|---|---|---|
| committer | Alex Johnstone <alexjj@gmail.com> | 2016-03-25 11:16:33 -0700 |
| commit | 2d9037491271677f6642ec162b6a8be3ebb47e78 (patch) | |
| tree | d3847db7e2b68c11f704e9635bc832ac7ec7a1e9 /keyboard/jd45 | |
| parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
| parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) | |
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'keyboard/jd45')
| -rw-r--r-- | keyboard/jd45/jd45.c | 8 | ||||
| -rw-r--r-- | keyboard/jd45/jd45.h | 4 |
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 |