summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/ergodox_ez.h
diff options
context:
space:
mode:
authorNoah Andrews2016-03-28 18:37:39 -0400
committerNoah Andrews2016-03-28 18:37:39 -0400
commit535daad3cd812df58f4630df202a447836ac3084 (patch)
tree4591f47555acb1d88f08caa7ab3bbb40fd828637 /keyboard/ergodox_ez/ergodox_ez.h
parentccf848917b7e931327f6c4a469877e9d8ef238ea (diff)
parent4a43c5684476611370820bd9592712754c211c52 (diff)
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
Diffstat (limited to 'keyboard/ergodox_ez/ergodox_ez.h')
-rw-r--r--keyboard/ergodox_ez/ergodox_ez.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/ergodox_ez/ergodox_ez.h b/keyboard/ergodox_ez/ergodox_ez.h
index aceb7ed9c..1e446baf6 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);