aboutsummaryrefslogtreecommitdiffstats
path: root/keyboard/hhkb_qmk/hhkb_qmk.h
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/hhkb_qmk/hhkb_qmk.h
parentccf848917b7e931327f6c4a469877e9d8ef238ea (diff)
parent26513b497b8bae5160389c0beac2d45cbb29c50f (diff)
downloadfirmware-e28334017c94c6928dd7e82436cec171f0243747.tar.gz
firmware-e28334017c94c6928dd7e82436cec171f0243747.tar.bz2
firmware-e28334017c94c6928dd7e82436cec171f0243747.zip
Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent
Diffstat (limited to 'keyboard/hhkb_qmk/hhkb_qmk.h')
-rw-r--r--keyboard/hhkb_qmk/hhkb_qmk.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/hhkb_qmk/hhkb_qmk.h b/keyboard/hhkb_qmk/hhkb_qmk.h
index f6bf20f43..1bac33c2d 100644
--- a/keyboard/hhkb_qmk/hhkb_qmk.h
+++ b/keyboard/hhkb_qmk/hhkb_qmk.h
@@ -24,7 +24,7 @@
{ K70, K71, K72, K73, K74, K75, K76, KC_NO } \
}
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
#endif