summaryrefslogtreecommitdiff
path: root/keyboards/atomic
diff options
context:
space:
mode:
authorDamien <Dbroqua@users.noreply.github.com>2017-05-26 15:57:08 +0200
committerGitHub <noreply@github.com>2017-05-26 15:57:08 +0200
commit0a4a966c6648e66a1129ae3af36639054d3e0ed3 (patch)
treeec50b19b9031b1f3f24e003879f95cf9690d61af /keyboards/atomic
parent7180e195e84aabf252fcadb2852644417ac1d663 (diff)
parent7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff)
downloadqmk_firmware-0a4a966c6648e66a1129ae3af36639054d3e0ed3.tar.gz
qmk_firmware-0a4a966c6648e66a1129ae3af36639054d3e0ed3.zip
Merge pull request #22 from qmk/master
Merge from QMK
Diffstat (limited to 'keyboards/atomic')
-rw-r--r--keyboards/atomic/keymaps/pvc/keymap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c
index d10bfe3bfc..c324078dd9 100644
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ b/keyboards/atomic/keymaps/pvc/keymap.c
@@ -255,7 +255,7 @@ float tone_scroll_off[][2] = SONG(SCROLL_LOCK_OFF_SOUND);
#endif /* AUDIO_ENABLE */
-void persistant_default_layer_set(uint16_t default_layer)
+void persistent_default_layer_set(uint16_t default_layer)
{
eeconfig_update_default_layer(default_layer);
default_layer_set(default_layer);
@@ -366,7 +366,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case MACRO_QWERTY:
if (record->event.pressed)
{
- persistant_default_layer_set(1UL<<LAYER_QWERTY);
+ persistent_default_layer_set(1UL<<LAYER_QWERTY);
}
break;