diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 08:38:13 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-03 08:38:13 +0100 |
commit | 467832032cc07626880363efa8625719c16c04eb (patch) | |
tree | ee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /drivers/char/keyboard.c | |
parent | Input: keyboard - fix lack of locking when traversing handler->h_list (diff) | |
parent | Linux 2.6.32 (diff) | |
download | linux-467832032cc07626880363efa8625719c16c04eb.tar.xz linux-467832032cc07626880363efa8625719c16c04eb.zip |
Merge commit 'v2.6.32' into next
Diffstat (limited to 'drivers/char/keyboard.c')
-rw-r--r-- | drivers/char/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c index ff8e9345f3c9..5619007e7e05 100644 --- a/drivers/char/keyboard.c +++ b/drivers/char/keyboard.c @@ -1262,7 +1262,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw) if (keycode >= NR_KEYS) if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8) - keysym = K(KT_BRL, keycode - KEY_BRL_DOT1 + 1); + keysym = U(K(KT_BRL, keycode - KEY_BRL_DOT1 + 1)); else return; else |