summaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-02-07 10:39:01 -0500
committerJack Humbert <jack.humb@gmail.com>2016-02-07 10:39:01 -0500
commit623666888fd0235476c1024fb937399c2185431f (patch)
tree5b4c060902c5b43c53e4c66ea3237e7315ed3b64 /quantum/keymap_common.c
parent5dc0d1dc20ecb36ac0295a409769c3e4c3f1e815 (diff)
parent8d785de796539ff54fa6c16d34c348d1c647b1f3 (diff)
Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard
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 057c0c60e5..ae109da16a 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;