Commit 68f3e662 authored Oct 17, 2007 by Al Viro Committed by Linus Torvalds Oct 16, 2007

fix adbhid mismerge



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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2b0460b5

drivers/macintosh/adbhid.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;