summaryrefslogtreecommitdiff
path: root/keyboard/planck/keymaps/lock/keymap.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/planck/keymaps/lock/keymap.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/planck/keymaps/lock/keymap.c')
-rw-r--r--keyboard/planck/keymaps/lock/keymap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboard/planck/keymaps/lock/keymap.c b/keyboard/planck/keymaps/lock/keymap.c
index 9585764629..f1629492ef 100644
--- a/keyboard/planck/keymaps/lock/keymap.c
+++ b/keyboard/planck/keymaps/lock/keymap.c
@@ -150,7 +150,7 @@ float start_up[][2] = {
{440.0*pow(2.0,(64)/12.0), 1000},
};
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
init_notes();
play_notes(&start_up, 9, false);
} \ No newline at end of file