From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 17 Oct 2007 00:02:46 +0000 (+0100)
Subject: fix adbhid mismerge
X-Git-Tag: v2.6.24-rc1~821
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=68f3e6622bb60c6b477971b56d1913077834fdcd;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 8cce016b3d0..2766e4fc4ea 100644
--- 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;