fix adbhid mismerge

This fixes a lost 'key' variable declaration that went missing in a mismerge (commit b981d8b) Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
git-mirror · Oct 17, 2007 · 68f3e66 · 68f3e66
1 parent 2b0460b
commit 68f3e66
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
@@ -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;