aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/keyboard.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-03 02:38:13 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-03 02:38:13 -0500
commit467832032cc07626880363efa8625719c16c04eb (patch)
treeee9a62c04f0b3106e412bc1b2dd1cea5566d5ca7 /drivers/char/keyboard.c
parent66d2a5952eab875f1286e04f738ef029afdaf013 (diff)
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
Merge commit 'v2.6.32' into next
Diffstat (limited to 'drivers/char/keyboard.c')
-rw-r--r--drivers/char/keyboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index ff8e9345f3c..5619007e7e0 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)
1262 1262
1263 if (keycode >= NR_KEYS) 1263 if (keycode >= NR_KEYS)
1264 if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8) 1264 if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8)
1265 keysym = K(KT_BRL, keycode - KEY_BRL_DOT1 + 1); 1265 keysym = U(K(KT_BRL, keycode - KEY_BRL_DOT1 + 1));
1266 else 1266 else
1267 return; 1267 return;
1268 else 1268 else