summaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorChristopher Browne2016-02-08 10:53:50 -0500
committerChristopher Browne2016-02-08 10:53:50 -0500
commitbbcc1046a6c7417367c602b7ff46df1cef93804f (patch)
treeae51eef4043546360b17cc5893dc6e3b840d434c /quantum/keymap_common.c
parentfe1519de0750acb8377abbbcb4b47b766c11df9e (diff)
parent67f14d938b1cc9fd6713d91a0995d51ee6818a80 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 057c0c60e..ae109da16 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -64,7 +64,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
action.code = ACTION_MACRO(keycode & 0xFF);
return action;
#ifdef BACKLIGHT_ENABLE
- } else if (keycode >= BL_0 & keycode <= BL_15) {
+ } else if (keycode >= BL_0 && keycode <= BL_15) {
action_t action;
action.code = ACTION_BACKLIGHT_LEVEL(keycode & 0x000F);
return action;