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/ergodox_ez/ergodox_ez.h | |
| parent | fb6dc7499f51688ec245826842300780273203c6 (diff) | |
| parent | c9aec8bc246fe45a6486a5ef7a9ef1302e4e16ad (diff) | |
Merge pull request #3 from jackhumbert/master
Pull upstream
Diffstat (limited to 'keyboard/ergodox_ez/ergodox_ez.h')
| -rw-r--r-- | keyboard/ergodox_ez/ergodox_ez.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/ergodox_ez.h b/keyboard/ergodox_ez/ergodox_ez.h index aceb7ed9c3..1e446baf6f 100644 --- a/keyboard/ergodox_ez/ergodox_ez.h +++ b/keyboard/ergodox_ez/ergodox_ez.h @@ -123,8 +123,8 @@ inline void ergodox_led_all_set(uint8_t n) { k0D, k1D, k2D, k3D, k4D, KC_NO } \ } -void * matrix_init_user(void); -void * matrix_scan_user(void); +void matrix_init_user(void); +void matrix_scan_user(void); |