fix adbhid mismerge

This fixes a lost 'key' variable declaration that went missing in a
mismerge (commit b981d8b3f5)

Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Al Viro 2007-10-17 01:02:46 +01:00 • committed by Linus Torvalds
commit 68f3e6622b

View file

@ -282,7 +282,7 @@ static void
adbhid_input_keycode(int id, int scancode, int repeat)
{
struct adbhid *ahid = adbhid[id];
int keycode, up_flag;
int keycode, up_flag, key;
keycode = scancode & 0x7f;
up_flag = scancode & 0x80;