Эх сурвалжийг харах

fix adbhid mismerge

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Al Viro 17 жил өмнө
parent
commit
68f3e6622b

+ 1 - 1
drivers/macintosh/adbhid.c

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